diff --git a/src/views/makeInventory/MakeInventoryList.vue b/src/views/makeInventory/MakeInventoryList.vue
new file mode 100644
index 0000000..6310595
--- /dev/null
+++ b/src/views/makeInventory/MakeInventoryList.vue
@@ -0,0 +1,225 @@
+<template>
+ <a-card :bordered="false">
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 查询区域-END -->
+
+ <!-- 操作按钮区域 -->
+ <div class="table-operator">
+ <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('自制件库存表')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">导入</a-button>
+ </a-upload>
+ <!-- 高级查询区域 -->
+ <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table区域-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+ <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ :scroll="{x:true}"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ class="j-table-force-nowrap"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+ <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 下载
+ </a-button>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">编辑</a>
+
+ <a-divider type="vertical" />
+ <a-dropdown>
+ <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a @click="handleDetail(record)">详情</a>
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+ <a>删除</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+
+ </a-table>
+ </div>
+
+ <make-inventory-modal ref="modalForm" @ok="modalFormOk"></make-inventory-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import MakeInventoryModal from './modules/MakeInventoryModal'
+
+ export default {
+ name: 'MakeInventoryList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ MakeInventoryModal
+ },
+ data () {
+ return {
+ description: '自制件库存表管理页面',
+ // 表头
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'名称',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title:'规格',
+ align:"center",
+ dataIndex: 'spec'
+ },
+ {
+ title:'图号',
+ align:"center",
+ dataIndex: 'drawNo'
+ },
+ {
+ title:'生产计划明细表id',
+ align:"center",
+ dataIndex: 'scheduDeailId'
+ },
+ {
+ title:'料号',
+ align:"center",
+ dataIndex: 'no'
+ },
+ {
+ title:'库存',
+ align:"center",
+ dataIndex: 'qty'
+ },
+ {
+ title:'生产计划头表id',
+ align:"center",
+ dataIndex: 'schdulerHeadId'
+ },
+ {
+ title:'工作令',
+ align:"center",
+ dataIndex: 'workno'
+ },
+ {
+ title:'产品类型',
+ align:"center",
+ dataIndex: 'productType'
+ },
+ {
+ title:'父料号',
+ align:"center",
+ dataIndex: 'fatherNo'
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/makeInventory/makeInventory/list",
+ delete: "/makeInventory/makeInventory/delete",
+ deleteBatch: "/makeInventory/makeInventory/deleteBatch",
+ exportXlsUrl: "/makeInventory/makeInventory/exportXls",
+ importExcelUrl: "makeInventory/makeInventory/importExcel",
+
+ },
+ dictOptions:{},
+ superFieldList:[],
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ },
+ methods: {
+ initDictConfig(){
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+ fieldList.push({type:'string',value:'spec',text:'规格',dictCode:''})
+ fieldList.push({type:'string',value:'drawNo',text:'图号',dictCode:''})
+ fieldList.push({type:'string',value:'scheduDeailId',text:'生产计划明细表id',dictCode:''})
+ fieldList.push({type:'string',value:'no',text:'料号',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'qty',text:'库存',dictCode:''})
+ fieldList.push({type:'string',value:'schdulerHeadId',text:'生产计划头表id',dictCode:''})
+ fieldList.push({type:'string',value:'workno',text:'工作令',dictCode:''})
+ fieldList.push({type:'int',value:'productType',text:'产品类型',dictCode:''})
+ fieldList.push({type:'string',value:'fatherNo',text:'父料号',dictCode:''})
+ this.superFieldList = fieldList
+ }
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/makeInventory/modules/MakeInventoryForm.vue b/src/views/makeInventory/modules/MakeInventoryForm.vue
new file mode 100644
index 0000000..07f27fa
--- /dev/null
+++ b/src/views/makeInventory/modules/MakeInventoryForm.vue
@@ -0,0 +1,199 @@
+<template>
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="formDisabled">
+ <a-form :form="form" slot="detail">
+ <a-row>
+ <a-col :span="24">
+ <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-decorator="['name']" placeholder="请输入名称" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-decorator="['spec']" placeholder="请输入规格" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item label="图号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-decorator="['drawNo']" placeholder="请输入图号" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item label="生产计划明细表id" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-decorator="['scheduDeailId']" placeholder="请输入生产计划明细表id" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item label="料号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-decorator="['no']" placeholder="请输入料号" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item label="库存" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input-number v-decorator="['qty']" placeholder="请输入库存" style="width: 100%" />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item label="生产计划头表id" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-decorator="['schdulerHeadId']" placeholder="请输入生产计划头表id" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item label="工作令" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-decorator="['workno']" placeholder="请输入工作令" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item label="产品类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input-number v-decorator="['productType']" placeholder="请输入产品类型" style="width: 100%" />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item label="父料号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-decorator="['fatherNo']" placeholder="请输入父料号" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+ <a-button @click="submitForm">提 交</a-button>
+ </a-col>
+ </a-row>
+ </a-form>
+ </j-form-container>
+ </a-spin>
+</template>
+
+<script>
+
+ import { httpAction, getAction } from '@/api/manage'
+ import pick from 'lodash.pick'
+ import { validateDuplicateValue } from '@/utils/util'
+
+ export default {
+ name: 'MakeInventoryForm',
+ components: {
+ },
+ props: {
+ //流程表单data
+ formData: {
+ type: Object,
+ default: ()=>{},
+ required: false
+ },
+ //表单模式：true流程表单 false普通表单
+ formBpm: {
+ type: Boolean,
+ default: false,
+ required: false
+ },
+ //表单禁用
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ data () {
+ return {
+ form: this.$form.createForm(this),
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ confirmLoading: false,
+ validatorRules: {
+ },
+ url: {
+ add: "/makeInventory/makeInventory/add",
+ edit: "/makeInventory/makeInventory/edit",
+ queryById: "/makeInventory/makeInventory/queryById"
+ }
+ }
+ },
+ computed: {
+ formDisabled(){
+ if(this.formBpm===true){
+ if(this.formData.disabled===false){
+ return false
+ }
+ return true
+ }
+ return this.disabled
+ },
+ showFlowSubmitButton(){
+ if(this.formBpm===true){
+ if(this.formData.disabled===false){
+ return true
+ }
+ }
+ return false
+ }
+ },
+ created () {
+ //如果是流程中表单，则需要加载流程表单data
+ this.showFlowData();
+ },
+ methods: {
+ add () {
+ this.edit({});
+ },
+ edit (record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model,'name','spec','drawNo','scheduDeailId','no','qty','schdulerHeadId','workno','productType','fatherNo'))
+ })
+ },
+ //渲染流程表单数据
+ showFlowData(){
+ if(this.formBpm === true){
+ let params = {id:this.formData.dataId};
+ getAction(this.url.queryById,params).then((res)=>{
+ if(res.success){
+ this.edit (res.result);
+ }
+ });
+ }
+ },
+ submitForm () {
+ const that = this;
+ // 触发表单验证
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ method = 'put';
+ }
+ let formData = Object.assign(this.model, values);
+ console.log("表单提交数据",formData)
+ httpAction(httpurl,formData,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ })
+ }
+
+ })
+ },
+ popupCallback(row){
+ this.form.setFieldsValue(pick(row,'name','spec','drawNo','scheduDeailId','no','qty','schdulerHeadId','workno','productType','fatherNo'))
+ },
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/makeInventory/modules/MakeInventoryModal.vue b/src/views/makeInventory/modules/MakeInventoryModal.vue
new file mode 100644
index 0000000..25b33f3
--- /dev/null
+++ b/src/views/makeInventory/modules/MakeInventoryModal.vue
@@ -0,0 +1,60 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="width"
+ :visible="visible"
+ switchFullscreen
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel"
+ cancelText="关闭">
+ <make-inventory-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></make-inventory-form>
+ </j-modal>
+</template>
+
+<script>
+
+ import MakeInventoryForm from './MakeInventoryForm'
+ export default {
+ name: 'MakeInventoryModal',
+ components: {
+ MakeInventoryForm
+ },
+ data () {
+ return {
+ title:'',
+ width:800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.submitForm();
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/makeInventory/modules/MakeInventoryModal__Style#Drawer.vue b/src/views/makeInventory/modules/MakeInventoryModal__Style#Drawer.vue
new file mode 100644
index 0000000..31f8ae4
--- /dev/null
+++ b/src/views/makeInventory/modules/MakeInventoryModal__Style#Drawer.vue
@@ -0,0 +1,83 @@
+<template>
+ <a-drawer
+ :title="title"
+ :width="width"
+ placement="right"
+ :closable="false"
+ @close="close"
+ :visible="visible">
+ <make-inventory-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></make-inventory-form>
+ <div class="drawer-footer">
+ <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+ <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+ </div>
+ </a-drawer>
+</template>
+
+<script>
+
+ import MakeInventoryForm from './MakeInventoryForm'
+
+ export default {
+ name: 'MakeInventoryModal',
+ components: {
+ MakeInventoryForm
+ },
+ data () {
+ return {
+ title:"操作",
+ width:800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ });
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.submitForm();
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+ .ant-btn {
+ margin-left: 30px;
+ margin-bottom: 30px;
+ float: right;
+ }
+ .drawer-footer{
+ position: absolute;
+ bottom: -8px;
+ width: 100%;
+ border-top: 1px solid #e8e8e8;
+ padding: 10px 16px;
+ text-align: right;
+ left: 0;
+ background: #fff;
+ border-radius: 0 0 2px 2px;
+ }
+</style>
\ No newline at end of file