diff --git a/src/views/activiti/form/ProcessMaterialsAllot.vue b/src/views/activiti/form/ProcessMaterialsAllot.vue
index c3c8787..f7c21a9 100644
--- a/src/views/activiti/form/ProcessMaterialsAllot.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllot.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" style="text-align: center;background-color: #eaeaea">
+  <a-card :bordered="false" style="text-align: center;background-color: #f3f3f3">
 
     <a-tabs>
       <a-tab-pane tab="流程正文" key="1" forceRender>
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index 6b4673e..a203d96 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -2,7 +2,7 @@
   <a-spin :spinning="confirmLoading" style="height: 650px">
     <j-form-container :disabled="formDisabled">
       <!-- 主表单区域 -->
-      <a-form :form="form" slot="detail" style="background-color: #e8e5e5">
+      <a-form :form="form" slot="detail" style="background-color: #e5e5e5;padding-top: 10px">
         <a-row>
           <a-col :span="8" v-show="false">
             <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -63,7 +63,7 @@
       </a-form>
     </j-form-container>
     <!-- 子表单区域 -->
-    <a-tabs v-model="activeKey" @change="handleChangeTabs" style="background-color: #d7d7d9;margin-top: 20px">
+    <a-tabs v-model="activeKey" @change="handleChangeTabs" style="background-color: #dcdcdc;margin-top: 20px;padding: 0px 10px">
       <a-tab-pane tab="物资调拨流程调拨清单" :key="refKeys[0]" :forceRender="true">
         <p-editable-table
           ref="processMaterialsAllotList"
diff --git a/src/views/gunpowder/ProcessIndustrialExplosiveList.vue b/src/views/gunpowder/ProcessIndustrialExplosiveList.vue
new file mode 100644
index 0000000..91d3ad1
--- /dev/null
+++ b/src/views/gunpowder/ProcessIndustrialExplosiveList.vue
@@ -0,0 +1,310 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+              <a-col :xl="5" :lg="7" :md="8" :sm="16">
+                <a-form-item label="火工品名称规格">
+                  <a-input placeholder="请输入火工品名称规格" v-model="queryParam.pyrotechnicsName"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xl="5" :lg="7" :md="8" :sm="16">
+                <a-form-item label="生产厂家">
+                  <a-input placeholder="请输入生产厂家" v-model="queryParam.manufacturer"/>
+                </a-form-item>
+              </a-col>
+              <a-col :xl="5" :lg="7" :md="8" :sm="16">
+                <a-form-item label="火工品编码">
+                  <a-input placeholder="请输入火工品编码" v-model="queryParam.pyrotechnics"/>
+                </a-form-item>
+              </a-col>
+              <a-col :xl="5" :lg="7" :md="8" :sm="16">
+                <a-form-item label="火工品类别">
+                  <j-dict-select-tag placeholder="请输入火工品类别" v-model="queryParam.category" dictCode="material_type"></j-dict-select-tag>
+                </a-form-item>
+              </a-col>
+
+        </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('process_industrial_explosive')">导出</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>
+      <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+      <!-- 高级查询区域 -->
+<!--      <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-button style="margin-left: 8px" @click="batchDel"><a-icon type="delete"/>删除</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,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" 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>
+
+    <process-industrial-explosive-modal ref="modalForm" @ok="modalFormOk"></process-industrial-explosive-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessIndustrialExplosiveModal from './modules/ProcessIndustrialExplosiveModal'
+
+  export default {
+    name: 'ProcessIndustrialExplosiveList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProcessIndustrialExplosiveModal
+    },
+    data () {
+      return {
+        description: 'process_industrial_explosive管理页面',
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'生产厂家',
+            align:"center",
+            dataIndex: 'manufacturer'
+          },
+          {
+            title:'火工品编码',
+            align:"center",
+            dataIndex: 'pyrotechnics'
+          },
+          {
+            title:'名称规格',
+            align:"center",
+            dataIndex: 'pyrotechnicsName'
+          },
+          {
+            title:'火工品类别',
+            align:"center",
+            dataIndex: 'category'
+          },
+          {
+            title:'单位',
+            align:"center",
+            dataIndex: 'unit'
+          },
+          {
+            title:'生产日期',
+            align:"center",
+            dataIndex: 'producedDate',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'年初总量',
+            align:"center",
+            dataIndex: 'yearBeginningGross'
+          },
+          // {
+          //   title:'年初数量(没有)',
+          //   align:"center",
+          //   dataIndex: 'yearBeginningNumber'
+          // },
+          {
+            title:'库存总量',
+            align:"center",
+            dataIndex: 'repertoryGross'
+          },
+          {
+            title:'库存数量',
+            align:"center",
+            dataIndex: 'repertoryNumber'
+          },
+          {
+            title:'过期报废',
+            align:"center",
+            dataIndex: 'staleDated',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'库别',
+            align:"center",
+            dataIndex: 'kube'
+          },
+          {
+            title:'主货位',
+            align:"center",
+            dataIndex: 'lordGoodsAllocation'
+          },
+          {
+            title:'副货位',
+            align:"center",
+            dataIndex: 'assistantGoodsAllocation'
+          },
+          {
+            title:'单价',
+            align:"center",
+            dataIndex: 'unitPrice'
+          },
+          {
+            title:'射孔弹每箱发数',
+            align:"center",
+            dataIndex: 'number'
+          },
+          {
+            title:'箱数',
+            align:"center",
+            dataIndex: 'cartonNumbers'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          // {
+          //   title:'删除状态',
+          //   align:"center",
+          //   dataIndex: 'delFlag'
+          // },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/gunpowder/processIndustrialExplosive/list",
+          delete: "/gunpowder/processIndustrialExplosive/delete",
+          deleteBatch: "/gunpowder/processIndustrialExplosive/deleteBatch",
+          exportXlsUrl: "/gunpowder/processIndustrialExplosive/exportXls",
+          importExcelUrl: "gunpowder/processIndustrialExplosive/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:'manufacturer',text:'生产厂家',dictCode:''})
+        fieldList.push({type:'string',value:'pyrotechnics',text:'火工品编码',dictCode:''})
+        fieldList.push({type:'string',value:'pyrotechnicsName',text:'火工品名称规格',dictCode:''})
+        fieldList.push({type:'string',value:'category',text:'火工品类别',dictCode:''})
+        fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
+        fieldList.push({type:'date',value:'producedDate',text:'生产日期'})
+        fieldList.push({type:'int',value:'yearBeginningGross',text:'年初总量',dictCode:''})
+        fieldList.push({type:'int',value:'yearBeginningNumber',text:'年初数量(没有)',dictCode:''})
+        fieldList.push({type:'int',value:'repertoryGross',text:'库存总量',dictCode:''})
+        fieldList.push({type:'int',value:'repertoryNumber',text:'库存数量',dictCode:''})
+        fieldList.push({type:'date',value:'staleDated',text:'过期报废'})
+        fieldList.push({type:'string',value:'kube',text:'库别',dictCode:''})
+        fieldList.push({type:'string',value:'lordGoodsAllocation',text:'主货位',dictCode:''})
+        fieldList.push({type:'string',value:'assistantGoodsAllocation',text:'副货位',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'unitPrice',text:'单价',dictCode:''})
+        fieldList.push({type:'int',value:'number',text:'射孔弹每箱发数',dictCode:''})
+        fieldList.push({type:'int',value:'cartonNumbers',text:'箱数',dictCode:''})
+        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',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/gunpowder/ProcessIndustrialScrapList.vue b/src/views/gunpowder/ProcessIndustrialScrapList.vue
new file mode 100644
index 0000000..df01ec5
--- /dev/null
+++ b/src/views/gunpowder/ProcessIndustrialScrapList.vue
@@ -0,0 +1,277 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :xl="5" :lg="7" :md="8" :sm="16">
+            <a-form-item label="火工品名称规格">
+              <a-input placeholder="请输入火工品名称规格" v-model="queryParam.pyrotechnicsName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="5" :lg="7" :md="8" :sm="16">
+            <a-form-item label="生产厂家">
+              <a-input placeholder="请输入生产厂家" v-model="queryParam.manufacturer"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="5" :lg="7" :md="8" :sm="16">
+            <a-form-item label="火工品编码">
+              <a-input placeholder="请输入火工品编码" v-model="queryParam.pyrotechnics"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="5" :lg="7" :md="8" :sm="16">
+            <a-form-item label="火工品类别">
+              <j-dict-select-tag placeholder="请输入火工品类别" v-model="queryParam.category" dictCode="material_type"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
+
+        </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('process_industrial_scrap')">导出</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>
+      <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+      <!-- 高级查询区域 -->
+<!--      <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-button style="margin-left: 8px" @click="batchDel"><a-icon type="delete"/>删除</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,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" 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>
+
+    <process-industrial-scrap-modal ref="modalForm" @ok="modalFormOk"></process-industrial-scrap-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessIndustrialScrapModal from './modules/ProcessIndustrialScrapModal'
+
+  export default {
+    name: 'ProcessIndustrialScrapList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProcessIndustrialScrapModal
+    },
+    data () {
+      return {
+        description: 'process_industrial_scrap管理页面',
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'火工品编号',
+            align:"center",
+            dataIndex: 'pyrotechnics'
+          },
+          {
+            title:'火工品名称及规格',
+            align:"center",
+            dataIndex: 'pyrotechnicsName'
+          },
+          {
+            title:'火工品类型',
+            align:"center",
+            dataIndex: 'category'
+          },
+          {
+            title:'单位',
+            align:"center",
+            dataIndex: 'unit'
+          },
+          {
+            title:'生产厂家',
+            align:"center",
+            dataIndex: 'manufacturer'
+          },
+          {
+            title:'支出数量',
+            align:"center",
+            dataIndex: 'disburseNum'
+          },
+          {
+            title:'用料单位',
+            align:"center",
+            dataIndex: 'materialUnit'
+          },
+          {
+            title:'用料班组',
+            align:"center",
+            dataIndex: 'materialTeam'
+          },
+          {
+            title:'领料人',
+            align:"center",
+            dataIndex: 'materialHandler'
+          },
+          {
+            title:'井号',
+            align:"center",
+            dataIndex: 'wellNumber'
+          },
+          {
+            title:'库房',
+            align:"center",
+            dataIndex: 'kube'
+          },
+          {
+            title:'单价',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'主货位',
+            align:"center",
+            dataIndex: 'goodsAllocation'
+          },
+          {
+            title:'出库时间',
+            align:"center",
+            dataIndex: 'deliveryTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/gunpowder/processIndustrialScrap/list",
+          delete: "/gunpowder/processIndustrialScrap/delete",
+          deleteBatch: "/gunpowder/processIndustrialScrap/deleteBatch",
+          exportXlsUrl: "/gunpowder/processIndustrialScrap/exportXls",
+          importExcelUrl: "gunpowder/processIndustrialScrap/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'date',value:'deliveryTime',text:'出库时间'})
+        fieldList.push({type:'string',value:'pyrotechnics',text:'火工品编号',dictCode:''})
+        fieldList.push({type:'string',value:'pyrotechnicsName',text:'火工品名称及规格',dictCode:''})
+        fieldList.push({type:'string',value:'category',text:'火工品类型',dictCode:''})
+        fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
+        fieldList.push({type:'string',value:'manufacturer',text:'生产厂家',dictCode:''})
+        fieldList.push({type:'int',value:'disburseNum',text:'支出数量',dictCode:''})
+        fieldList.push({type:'string',value:'materialUnit',text:'用料单位',dictCode:''})
+        fieldList.push({type:'string',value:'materialTeam',text:'用料班组',dictCode:''})
+        fieldList.push({type:'string',value:'materialHandler',text:'领料人',dictCode:''})
+        fieldList.push({type:'string',value:'wellNumber',text:'井号',dictCode:''})
+        fieldList.push({type:'string',value:'kube',text:'库房',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
+        fieldList.push({type:'string',value:'goodsAllocation',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/gunpowder/modules/ProcessIndustrialExplosiveForm.vue b/src/views/gunpowder/modules/ProcessIndustrialExplosiveForm.vue
new file mode 100644
index 0000000..0952e35
--- /dev/null
+++ b/src/views/gunpowder/modules/ProcessIndustrialExplosiveForm.vue
@@ -0,0 +1,194 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="8">
+            <a-form-model-item label="生产厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufacturer">
+              <a-input v-model="model.manufacturer" placeholder="请输入生产厂家"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="火工品编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pyrotechnics">
+              <a-input v-model="model.pyrotechnics" placeholder="请输入火工品编码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="火工品名称规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pyrotechnicsName">
+              <a-input v-model="model.pyrotechnicsName" placeholder="请输入火工品名称规格"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="火工品类别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="category">
+              <a-input v-model="model.category" placeholder="请输入火工品类别"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit">
+              <a-input v-model="model.unit" placeholder="请输入单位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="生产日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="producedDate">
+              <j-date placeholder="请选择生产日期" v-model="model.producedDate"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="年初总量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearBeginningGross">
+              <a-input-number v-model="model.yearBeginningGross" placeholder="请输入年初总量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="8">-->
+<!--            <a-form-model-item label="年初数量(没有)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearBeginningNumber">-->
+<!--              <a-input-number v-model="model.yearBeginningNumber" placeholder="请输入年初数量(没有)" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+          <a-col :span="8">
+            <a-form-model-item label="库存总量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repertoryGross">
+              <a-input-number v-model="model.repertoryGross" placeholder="请输入库存总量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="库存数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repertoryNumber">
+              <a-input-number v-model="model.repertoryNumber" placeholder="请输入库存数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="过期报废" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="staleDated">
+              <j-date placeholder="请选择过期报废" v-model="model.staleDated"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="库别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kube">
+              <a-input v-model="model.kube" placeholder="请输入库别"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="主货位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lordGoodsAllocation">
+              <a-input v-model="model.lordGoodsAllocation" placeholder="请输入主货位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="副货位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="assistantGoodsAllocation">
+              <a-input v-model="model.assistantGoodsAllocation" placeholder="请输入副货位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unitPrice">
+              <a-input-number v-model="model.unitPrice" placeholder="请输入单价" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="射孔弹每箱发数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
+              <a-input-number v-model="model.number" placeholder="请输入射孔弹每箱发数" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="箱数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cartonNumbers">
+              <a-input-number v-model="model.cartonNumbers" placeholder="请输入箱数" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="删除状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <a-input-number v-model="model.delFlag" placeholder="请输入删除状态" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ProcessIndustrialExplosiveForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 8 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/gunpowder/processIndustrialExplosive/add",
+          edit: "/gunpowder/processIndustrialExplosive/edit",
+          queryById: "/gunpowder/processIndustrialExplosive/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/gunpowder/modules/ProcessIndustrialExplosiveModal.Style#Drawer.vue b/src/views/gunpowder/modules/ProcessIndustrialExplosiveModal.Style#Drawer.vue
new file mode 100644
index 0000000..db031da
--- /dev/null
+++ b/src/views/gunpowder/modules/ProcessIndustrialExplosiveModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <process-industrial-explosive-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></process-industrial-explosive-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 ProcessIndustrialExplosiveForm from './ProcessIndustrialExplosiveForm'
+
+  export default {
+    name: 'ProcessIndustrialExplosiveModal',
+    components: {
+      ProcessIndustrialExplosiveForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:1024,
+        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
diff --git a/src/views/gunpowder/modules/ProcessIndustrialExplosiveModal.vue b/src/views/gunpowder/modules/ProcessIndustrialExplosiveModal.vue
new file mode 100644
index 0000000..0be6b81
--- /dev/null
+++ b/src/views/gunpowder/modules/ProcessIndustrialExplosiveModal.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="关闭">
+    <process-industrial-explosive-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-industrial-explosive-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProcessIndustrialExplosiveForm from './ProcessIndustrialExplosiveForm'
+  export default {
+    name: 'ProcessIndustrialExplosiveModal',
+    components: {
+      ProcessIndustrialExplosiveForm
+    },
+    data () {
+      return {
+        title:'',
+        width:1024,
+        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/gunpowder/modules/ProcessIndustrialScrapForm.vue b/src/views/gunpowder/modules/ProcessIndustrialScrapForm.vue
new file mode 100644
index 0000000..31029bc
--- /dev/null
+++ b/src/views/gunpowder/modules/ProcessIndustrialScrapForm.vue
@@ -0,0 +1,173 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="8">
+            <a-form-model-item label="出库时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryTime">
+              <j-date placeholder="请选择出库时间" v-model="model.deliveryTime"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="火工品编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pyrotechnics">
+              <a-input v-model="model.pyrotechnics" placeholder="请输入火工品编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="名称及规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pyrotechnicsName">
+              <a-input v-model="model.pyrotechnicsName" placeholder="请输入火工品名称及规格"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="火工品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="category">
+              <a-input v-model="model.category" placeholder="请输入火工品类型"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit">
+              <a-input v-model="model.unit" placeholder="请输入单位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="生产厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufacturer">
+              <a-input v-model="model.manufacturer" placeholder="请输入生产厂家"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="支出数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="disburseNum">
+              <a-input-number v-model="model.disburseNum" placeholder="请输入支出数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="用料单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialUnit">
+              <a-input v-model="model.materialUnit" placeholder="请输入用料单位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="用料班组" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialTeam">
+              <a-input v-model="model.materialTeam" placeholder="请输入用料班组"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="领料人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialHandler">
+              <a-input v-model="model.materialHandler" placeholder="请输入领料人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="井号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wellNumber">
+              <a-input v-model="model.wellNumber" placeholder="请输入井号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="库房" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kube">
+              <a-input v-model="model.kube" placeholder="请输入库房"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入单价" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="主货位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsAllocation">
+              <a-input v-model="model.goodsAllocation" placeholder="请输入主货位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ProcessIndustrialScrapForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 8 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           disburseNum: [
+              { required: true, message: '请输入支出数量!'},
+              { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'},
+           ],
+        },
+        url: {
+          add: "/gunpowder/processIndustrialScrap/add",
+          edit: "/gunpowder/processIndustrialScrap/edit",
+          queryById: "/gunpowder/processIndustrialScrap/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/gunpowder/modules/ProcessIndustrialScrapModal.Style#Drawer.vue b/src/views/gunpowder/modules/ProcessIndustrialScrapModal.Style#Drawer.vue
new file mode 100644
index 0000000..601f33d
--- /dev/null
+++ b/src/views/gunpowder/modules/ProcessIndustrialScrapModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <process-industrial-scrap-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></process-industrial-scrap-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 ProcessIndustrialScrapForm from './ProcessIndustrialScrapForm'
+
+  export default {
+    name: 'ProcessIndustrialScrapModal',
+    components: {
+      ProcessIndustrialScrapForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:1024,
+        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
diff --git a/src/views/gunpowder/modules/ProcessIndustrialScrapModal.vue b/src/views/gunpowder/modules/ProcessIndustrialScrapModal.vue
new file mode 100644
index 0000000..a11b51c
--- /dev/null
+++ b/src/views/gunpowder/modules/ProcessIndustrialScrapModal.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="关闭">
+    <process-industrial-scrap-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-industrial-scrap-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProcessIndustrialScrapForm from './ProcessIndustrialScrapForm'
+  export default {
+    name: 'ProcessIndustrialScrapModal',
+    components: {
+      ProcessIndustrialScrapForm
+    },
+    data () {
+      return {
+        title:'',
+        width:1024,
+        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