java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改统计

dev
caoyizhong 2 years ago
parent
8bd44bd236
commit
38215b5542
16 changed files with 1558 additions and 244 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  2. 250
      src/views/firer/ProcessFirerList.vue
  3. 151
      src/views/firer/modules/ProcessFirerForm.vue
  4. 84
      src/views/firer/modules/ProcessFirerModal.Style#Drawer.vue
  5. 60
      src/views/firer/modules/ProcessFirerModal.vue
  6. 158
      src/views/gunpowder/ProcessIndustrialExplosiveList.vue
  7. 309
      src/views/gunpowder/ProcessIndustrialExplosiveLists.vue
  8. 145
      src/views/gunpowder/ProcessIndustrialScrapList.vue
  9. 276
      src/views/gunpowder/ProcessIndustrialScrapLists.vue
  10. 14
      src/views/gunpowder/modules/ProcessIndustrialExplosiveForm.vue
  11. 2
      src/views/gunpowder/modules/ProcessIndustrialExplosiveModal.vue
  12. 5
      src/views/gunpowder/modules/ProcessIndustrialScrapForm.vue
  13. 6
      src/views/statisticanalysis/CostStatistic.vue
  14. 187
      src/views/statisticanalysis/costecharts/Cost.vue
  15. 85
      src/views/statisticanalysis/costecharts/ItemCost.vue
  16. 38
      src/views/statisticanalysis/costecharts/OnDayCost.vue

32
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -77,7 +77,7 @@
</a-form-item>
</a-col>
<a-col :span="8" v-if="isIfDirect">
<a-form-item label="是否属于直达物资" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="是否直达物资" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['ifDirect',validatorRules.ifDirect]"
:trigger-change="true" dictCode="if_status"
placeholder="请选择是否属于直达物资" @change="selectChang"/>
@ -304,11 +304,11 @@
},
labelCol2: {
xs: { span: 24 },
sm: { span: 3 }
sm: { span: 6 }
},
wrapperCol2: {
xs: { span: 24 },
sm: { span: 20 }
sm: { span: 15 }
},
labelCol3: {
xs: { span: 24 },
@ -1420,21 +1420,23 @@
async getSortNum(number){
let sortNum = "001";
await getAction(this.url.getSortOrder,{}).then(res =>{
// console.log(res.result.sort,"==s-fdhtsdfb");
if(!!res.result.sort){
let str = res.result.sort.split("-")
let i = str[str.length-1]
if(i < 10){
sortNum = "00"+parseInt(parseInt(i)+1);
}else if(i < 99){
sortNum = "0"+parseInt(parseInt(i)+1);
}else {
sortNum = parseInt(parseInt(i)+1);
console.log(res.result.sort,"==s-fdhtsdfb");
if(res.success){
if(!!res.result.sort){
let str = res.result.sort.split("-")
let i = str[str.length-1]
if(i < 10){
sortNum = "00"+parseInt(parseInt(i)+1);
}else if(i < 99){
sortNum = "0"+parseInt(parseInt(i)+1);
}else {
sortNum = parseInt(parseInt(i)+1);
}
// console.log(sortNum,"===========23542345")
}
// console.log(sortNum,"===========23542345")
}
}).catch(()=>{
this.$message.warning("请求异常")
// this.$message.warning("请求异常")
});
// console.log(sortNum,"===========1111111111111111")
let title = null;

250
src/views/firer/ProcessFirerList.vue
Unescape View File

@ -0,0 +1,250 @@
<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="6" :lg="7" :md="8" :sm="24">
<a-form-item label="火工品编码">
<a-input placeholder="请输入火工品编码" v-model="queryParam.pyrotechnics"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="火工品名称及规格">
<a-input placeholder="请输入火工品名称及规格" v-model="queryParam.pyrotechnicsName"></a-input>
</a-form-item>
</a-col>
<!-- <template v-if="toggleSearchStatus">-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="生产厂家">
<a-input placeholder="请输入生产厂家" v-model="queryParam.manufacturer"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="单位">
<a-input placeholder="请输入单位" v-model="queryParam.unit"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="火工品类别">
<!-- <a-input placeholder="请输入火工品类别" v-model="queryParam.category"></a-input>-->
<j-dict-select-tag placeholder="请输入火工品类别" v-model="queryParam.category" dictCode="explosive_type" ></j-dict-select-tag>
</a-form-item>
</a-col>
<!-- </template>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
<!-- <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
<!-- {{ toggleSearchStatus ? '收起' : '展开' }}-->
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
<!-- </a>-->
<!-- </span>-->
<!-- </a-col>-->
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button type="primary" @click="searchQuery" icon="search" >查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'firer:add'">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('process_firer')" v-has="'firer:export'">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import" v-has="'firer:import'">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'firer:deleteAll'">
<!-- <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-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
<!-- <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-firer-modal ref="modalForm" @ok="modalFormOk"></process-firer-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ProcessFirerModal from './modules/ProcessFirerModal'
export default {
name: 'ProcessFirerList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ProcessFirerModal
},
data () {
return {
description: 'process_firer管理页面',
// 表头
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: 'manufacturer'
},
{
title:'单位',
align:"center",
dataIndex: 'unit'
},
{
title:'火工品类别',
align:"center",
dataIndex: 'category'
},
// {
// title:'射孔弹每箱发数',
// align:"center",
// dataIndex: 'number'
// },
// {
// title:'状态',
// align:"center",
// dataIndex: 'state'
// },
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/firer/processFirer/list",
delete: "/firer/processFirer/delete",
deleteBatch: "/firer/processFirer/deleteBatch",
exportXlsUrl: "/firer/processFirer/exportXls",
importExcelUrl: "firer/processFirer/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:'pyrotechnics',text:'火工品编码',dictCode:''})
fieldList.push({type:'string',value:'pyrotechnicsName',text:'火工品名称及规格',dictCode:''})
fieldList.push({type:'string',value:'manufacturer',text:'生产厂家',dictCode:''})
fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
fieldList.push({type:'string',value:'category',text:'火工品类别',dictCode:''})
fieldList.push({type:'int',value:'number',text:'射孔弹每箱发数',dictCode:''})
fieldList.push({type:'int',value:'state',text:'状态',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

151
src/views/firer/modules/ProcessFirerForm.vue
Unescape View File

@ -0,0 +1,151 @@
<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="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="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="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="category">
<j-dict-select-tag placeholder="请输入火工品类别" v-model="model.category" dictCode="explosive_type" ></j-dict-select-tag>
<!-- <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="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="state">-->
<!-- <a-input-number v-model="model.state" 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: 'ProcessFirerForm',
components: {
},
props: {
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 7 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
pyrotechnics: [
{ required: false, message: '请输入火工品编号!'},
// { validator: (rule, value, callback) => validateDuplicateValue('process_firer', 'pyrotechnics', value, this.model.id, callback)},
],
pyrotechnicsName: [
{ required: true, message: '请输入火工品名称及规格!'},
],
manufacturer: [
{ required: true, message: '请输入生产厂家!'},
],
unit: [
{ required: true, message: '请输入单位!'},
],
category: [
{ required: true, message: '请输入火工品类别!'},
],
},
url: {
add: "/firer/processFirer/add",
edit: "/firer/processFirer/edit",
queryById: "/firer/processFirer/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>

84
src/views/firer/modules/ProcessFirerModal.Style#Drawer.vue
Unescape View File

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<process-firer-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></process-firer-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 ProcessFirerForm from './ProcessFirerForm'
export default {
name: 'ProcessFirerModal',
components: {
ProcessFirerForm
},
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>

60
src/views/firer/modules/ProcessFirerModal.vue
Unescape View File

@ -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-firer-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-firer-form>
</j-modal>
</template>
<script>
import ProcessFirerForm from './ProcessFirerForm'
export default {
name: 'ProcessFirerModal',
components: {
ProcessFirerForm
},
data () {
return {
title:'',
width:1224,
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>

158
src/views/gunpowder/ProcessIndustrialExplosiveList.vue
Unescape View File

@ -22,7 +22,7 @@
</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>
<j-dict-select-tag placeholder="请输入火工品类别" v-model="queryParam.category" dictCode="explosive_type"></j-dict-select-tag>
</a-form-item>
</a-col>
@ -33,16 +33,16 @@
<!-- 操作按钮区域 -->
<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-button @click="handleAdd" type="primary" icon="plus" v-has="'ProcessIndustrialExplosiveList:add'">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('process_industrial_explosive')" v-has="'ProcessIndustrialExplosiveList:export'">导出</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-button type="primary" icon="import" v-has="'ProcessIndustrialExplosiveList: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-dropdown v-if="selectedRowKeys.length > 0" v-has="'ProcessIndustrialExplosiveList:deleteAll'">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
<!-- </a-menu>-->
@ -93,22 +93,23 @@
</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>
<a class="ant-dropdown-link" @click="handleDetaills(record)"><a-icon type="unordered-list" /> 详情</a>
<!-- <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 class="ant-dropdown-link" @click="handleDetaills(record)"><a-icon type="unordered-list" /> 详情</a>-->
<!-- </a-menu-item>-->
<!-- <a-menu-item>-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!-- <a > <a-icon type="delete" />删除 </a>-->
<!-- </a-popconfirm>-->
<!-- </a-menu-item>-->
<!-- </a-menu>-->
<!-- </a-dropdown>-->
</span>
</a-table>
@ -146,11 +147,11 @@
return parseInt(index)+1;
}
},
{
title:'生产厂家',
align:"center",
dataIndex: 'manufacturer'
},
// {
// title:'生产厂家',
// align:"center",
// dataIndex: 'manufacturer'
// },
{
title:'火工品编码',
align:"center",
@ -171,14 +172,14 @@
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: 'producedDate',
// customRender:function (text) {
// return !text?"":(text.length>10?text.substr(0,10):text)
// }
// },
{
title:'年初总量',
align:"center",
@ -199,49 +200,49 @@
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: '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: 'number'
// },
// {
// title:'箱数',
// align:"center",
// dataIndex: 'cartonNumbers'
// },
// {
// title:'备注',
// align:"center",
// dataIndex: 'remark'
// },
// {
// title:'删除状态',
// align:"center",
@ -277,6 +278,21 @@
},
},
methods: {
handleDetaills(record){
console.log(record);
this.$router.push({
// name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',
// params:{
// item: record.merchandiseNewsId,
// merchandiseName : ' - '+record.merchandiseName.substring(0,record.merchandiseName.lastIndexOf(" "))
// }
path:'/gunpowder/ProcessIndustrialExplosiveLists',
query:{
item: record.merchandiseNewsId,
// merchandiseName : ' - '+record.merchandiseName.substring(0,10)
}
})
},
initDictConfig(){
},
getSuperFieldList(){

309
src/views/gunpowder/ProcessIndustrialExplosiveLists.vue
Unescape View File

@ -0,0 +1,309 @@
<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="explosive_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" v-has="'ProcessIndustrialExplosiveList:add'">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('process_industrial_explosive')" v-has="'ProcessIndustrialExplosiveList:export'">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import" v-has="'ProcessIndustrialExplosiveList: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" v-has="'ProcessIndustrialExplosiveList:deleteAll'">
<!-- <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"
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: 'ProcessIndustrialExplosiveLists',
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>

145
src/views/gunpowder/ProcessIndustrialScrapList.vue
Unescape View File

@ -22,7 +22,7 @@
</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>
<j-dict-select-tag placeholder="请输入火工品类别" v-model="queryParam.category" dictCode="explosive_type"></j-dict-select-tag>
</a-form-item>
</a-col>
@ -33,16 +33,16 @@
<!-- 操作按钮区域 -->
<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-button @click="handleAdd" type="primary" icon="plus" v-has="'ProcessIndustrialScrapList:add'">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('process_industrial_scrap')" v-has="'ProcessIndustrialScrapList:export'">导出</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-button type="primary" icon="import" v-has="'ProcessIndustrialScrapList:import'">导入</a-button>
</a-upload>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<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-dropdown v-if="selectedRowKeys.length > 0" v-has="'ProcessIndustrialScrapList:deleteAll'">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
<!-- </a-menu>-->
@ -93,22 +93,22 @@
</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>
<a class="ant-dropdown-link" @click="handleDetaills(record)"><a-icon type="unordered-list" /> 详情</a>
<!-- <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 class="ant-dropdown-link" @click="handleDetaills(record)"><a-icon type="unordered-list" />>详情</a>-->
<!-- </a-menu-item>-->
<!-- <a-menu-item>-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!-- <a> <a-icon type="delete" /> 删除</a>-->
<!-- </a-popconfirm>-->
<!-- </a-menu-item>-->
<!-- </a-menu>-->
<!-- </a-dropdown>-->
</span>
</a-table>
@ -166,59 +166,59 @@
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: '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: '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:'主货位',
// 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',
@ -249,6 +249,21 @@
},
},
methods: {
handleDetaills(record){
console.log(record);
this.$router.push({
// name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',
// params:{
// item: record.merchandiseNewsId,
// merchandiseName : ' - '+record.merchandiseName.substring(0,record.merchandiseName.lastIndexOf(" "))
// }
path:'/gunpowder/ProcessIndustrialScrapLists',
query:{
item: record.merchandiseNewsId,
// merchandiseName : ' - '+record.merchandiseName.substring(0,10)
}
})
},
initDictConfig(){
},
getSuperFieldList(){

276
src/views/gunpowder/ProcessIndustrialScrapLists.vue
Unescape View File

@ -0,0 +1,276 @@
<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="explosive_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" v-has="'ProcessIndustrialScrapList:add'">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('process_industrial_scrap')" v-has="'ProcessIndustrialScrapList:export'">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import" v-has="'ProcessIndustrialScrapList: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" v-has="'ProcessIndustrialScrapList:deleteAll'">
<!-- <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"
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: 'ProcessIndustrialScrapLists',
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>

14
src/views/gunpowder/modules/ProcessIndustrialExplosiveForm.vue
Unescape View File

@ -20,7 +20,9 @@
</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-input v-model="model.category" placeholder="请输入火工品类别" ></a-input>-->
<j-dict-select-tag placeholder="请输入火工品类别" v-model="model.category" dictCode="explosive_type" ></j-dict-select-tag>
</a-form-model-item>
</a-col>
<a-col :span="8">
@ -93,11 +95,11 @@
<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-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>

2
src/views/gunpowder/modules/ProcessIndustrialExplosiveModal.vue
Unescape View File

@ -23,7 +23,7 @@
data () {
return {
title:'',
width:1024,
width:1224,
visible: false,
disableSubmit: false
}

5
src/views/gunpowder/modules/ProcessIndustrialScrapForm.vue
Unescape View File

@ -20,9 +20,12 @@
</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-input v-model="model.category" placeholder="请输入火工品类型" ></a-input>-->
<j-dict-select-tag placeholder="请输入火工品类别" v-model="model.category" dictCode="explosive_type" ></j-dict-select-tag>
</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>

6
src/views/statisticanalysis/CostStatistic.vue
Unescape View File

@ -2,13 +2,13 @@
<!-- <div>成本统计</div>-->
<div style="height: 950px;display: flex;align-items: center;justify-content: flex-start;background-color: #ececec">
<div style="height: 100%;width:35%;">
<div style="height: 23%;">
<div style="height: 20%;">
<OnDayCost/>
</div>
<div style="height: 39%;">
<div style="height: 35%;">
<ItemCost/>
</div>
<div style="height: 38%;">
<div style="height: 35%;">
<!-- 成本-->
<Cost/>
</div>

187
src/views/statisticanalysis/costecharts/Cost.vue
Unescape View File

@ -1,22 +1,27 @@
<template>
<div style="width: 100%;height:100% ">
<div style="height: 30%;margin-left: 6%">
<div style="font-size: 19px;margin-bottom: 5px">公司成本</div>
<!-- <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">公司成本</div>-->
<div style="display: flex;align-items: center;justify-content: flex-start">
<div class="xian">月</div>
<div class="xian">季度</div>
<div class="xian">半年</div>
<div class="xian">年</div>
</div>
<div style="display: flex;align-items: center;justify-content: flex-start">
<div class="zi">生产类物资</div>
<div class="zi">非生产类物资</div>
<div class="zi">科研类物资</div>
<div class="zi">无形类资产</div>
<div style="width: 95%;height:100% ;background-color: #ffffff;margin-top: 2%;border-radius: 10px">
<div style="height: 25%;margin-left: 6%">
<div style="font-size: 25px;margin-bottom: 5px;padding-top: 5%">公司成本
<span style="margin: 0% 6%"> <a-month-picker :disabled-date="disabledDate" placeholder="选择日期" /> </span>
<j-dict-select-tag type="list" v-model="materialType" style="width: 30%"
:trigger-change="true" dictCode="material_type"
placeholder="请选择物资类型" @change="handleChange"/>
</div>
<!-- <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">公司成本</div>-->
<!-- <div style="display: flex;align-items: center;justify-content: flex-start">-->
<!-- <div class="xian">月</div>-->
<!-- <div class="xian">季度</div>-->
<!-- <div class="xian">半年</div>-->
<!-- <div class="xian">年</div>-->
<!-- </div>-->
<!-- <div style="display: flex;align-items: center;justify-content: flex-start">-->
<!-- <div class="zi">生产类物资</div>-->
<!-- <div class="zi">非生产类物资</div>-->
<!-- <div class="zi">科研类物资</div>-->
<!-- <div class="zi">无形类资产</div>-->
<!-- </div>-->
</div>
<div ref="myChartCon" style="width: 85%; height: 70%"></div>
<div ref="myChartCon" style="width: 95%; height: 75%"></div>
</div>
</template>
@ -37,20 +42,36 @@ name: "Cost",
data() {
return {
msg: '我的echarts图表',
materialType: null,
}
},
mounted() {
this.drawLine()
},
methods: {
handleChange(value) {
console.log(`selected ${value}`);
},
handleBlur() {
console.log('blur');
},
handleFocus() {
console.log('focus');
},
filterOption(input, option) {
return (
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
);
},
drawLine() {
// let echarts = require('echarts/lib/echarts')
// 基于准备好的dom，初始化echarts实例
let myChart = echarts.init(this.$refs["myChartCon"]);
// 绘制图表
myChart.setOption({
let option ={
// title: {
// text: '公司成本',
// text: '项目部成本',
// subtext: 'Living Expenses in Shenzhen'
// },
tooltip: {},
@ -63,22 +84,26 @@ name: "Cost",
containLabel: true
},
xAxis: {
data: ["1","2","3","4","5","6","7","8","9","10","11","12"],
type: 'category',
data: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
// show: false,
axisLine: {
show: false,
lineStyle: {
color: '#000000', //x轴的颜色
color: '#878686', //x轴的颜色
// width: 8, //轴线的宽度
},
}
},
yAxis: {
type: 'value',
axisLine: {
show: false,
lineStyle: {
color: '#000000', //x轴的颜色
color: '#8d8b8b', //x轴的颜色
// width: 8, //轴线的宽度
},
},
splitLine: {
show: true,
@ -88,26 +113,104 @@ name: "Cost",
}
},
},
series: [{
name: '数据',
type: 'bar',
data: [5, 20, 36, 10, 10, 20,70, 20, 36, 10, 90, 20],
// showBackground: true,
// backgroundStyle: {
// color: 'rgba(111, 162, 135, 0.2)'
// },
itemStyle: {
color: 'rgb(63,248,50,0.5)',
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
// offset: 0,
// color: 'rgb(133,163,124,0.1)'
// }, {
// offset: 1,
// color: 'rgb(133,163,124,0.1)'
// }]),
series: [
{
data: [10, 20, 40, 40, 50, 60,60,70,25,56,23,23], //对应每一个X坐标的值
type: 'line',
// itemStyle: {
// normal: {
// color: '#7b7777', //改变折线点的颜色
// lineStyle: {
// color: '#1ad933' //改变折线颜色
// }
// }
// },
areaStyle: {},
showSymbol: false,
// color:'#bfbcbc',
itemStyle: {
normal: {
// color: '#7b7777', //改变折线点的颜色
color:new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
offset: 0,
color: 'rgb(210,223,255)'
}, {
offset: 1,
color: 'rgb(253,253,255)'
}]),
lineStyle: {
color: 'rgb(52,112,255)' //改变折线颜色
}
}
},
smooth: true
}
}]
});
]
};
myChart.setOption(option)// 给生成的echarts实例进行传递配置项option
// 绘制图表
// myChart.setOption({
// // title: {
// // text: '公司成本',
// // subtext: 'Living Expenses in Shenzhen'
// // },
// tooltip: {},
// // 图表距边框的距离,可选值：'百分比'¦ {number}(单位px)
// grid: {
// top: '10%', // 等价于 y: '16%'
// left: '6%',
// right: '5%',
// bottom: '3%',
// containLabel: true
// },
// xAxis: {
// data: ["1","2","3","4","5","6","7","8","9","10","11","12"],
// axisLine: {
// lineStyle: {
// color: '#000000', //x轴的颜色
// // width: 8, //轴线的宽度
// },
//
// }
// },
// yAxis: {
// axisLine: {
// lineStyle: {
// color: '#000000', //x轴的颜色
// // width: 8, //轴线的宽度
// },
//
// },
// splitLine: {
// show: true,
// lineStyle: {
// type: 'dashed',
// color:'#c2cfd9'
// }
// },
// },
// series: [{
// name: '数据',
// type: 'bar',
// data: [5, 20, 36, 10, 10, 20,70, 20, 36, 10, 90, 20],
// // showBackground: true,
// // backgroundStyle: {
// // color: 'rgba(111, 162, 135, 0.2)'
// // },
// itemStyle: {
// color: 'rgb(63,248,50,0.5)',
// // color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
// // offset: 0,
// // color: 'rgb(133,163,124,0.1)'
// // }, {
// // offset: 1,
// // color: 'rgb(133,163,124,0.1)'
// // }]),
// }
// }]
// });
}
}

85
src/views/statisticanalysis/costecharts/ItemCost.vue
Unescape View File

@ -1,22 +1,29 @@
<template>
<!-- <div>项目成本</div>-->
<div style="width: 100%;height:100% ">
<div style="height: 30%;margin-left: 6%">
<div style="font-size: 19px;margin-bottom: 5px">项目部成本</div>
<!-- <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">项目部成本</div>-->
<div style="display: flex;align-items: center;justify-content: flex-start">
<div class="xian">月</div>
<div class="xian">季度</div>
<div class="xian">半年</div>
<div class="xian">年</div>
</div>
<div style="display: flex;align-items: center;justify-content: flex-start">
<div class="zi">生产类物资</div>
<div class="zi">非生产类物资</div>
<div class="zi">人员工资</div>
<div style="width: 95%;height:100% ;background-color: #ffffff;margin-top: 2%;border-radius: 10px">
<div style="height: 20%;margin-left: 6%;padding-top: 5%">
<div style="font-size: 25px;margin-bottom: 5px">项目部成本
<span style="margin: 0% 4%"> <a-month-picker :disabled-date="disabledDate" placeholder="选择日期" /> </span>
<j-dict-select-tag type="list" v-model="materialType" style="width: 30%"
:trigger-change="true" dictCode="material_type"
placeholder="请选择物资类型" @change="handleChange"/>
</div>
<!-- <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">项目部成本</div>-->
<!-- <div style="display: flex;align-items: center;justify-content: flex-start">-->
<!-- <div class="xian">月</div>-->
<!-- <div class="xian">季度</div>-->
<!-- <div class="xian">半年</div>-->
<!-- <div class="xian">年</div>-->
<!-- </div>-->
<!-- <div style="display: flex;align-items: center;justify-content: flex-start">-->
<!-- <div class="zi">生产类物资</div>-->
<!-- <div class="zi">非生产类物资</div>-->
<!-- <div class="zi">人员工资</div>-->
<!-- </div>-->
</div>
<div id="myItemCost" style="width: 85%; height: 70%"></div>
<div id="myItemCost" style="width: 95%; height: 75%"></div>
</div>
</template>
@ -36,12 +43,28 @@ export default {
data() {
return {
msg: '我的echarts图表',
value2: '',
materialType: null,
}
},
mounted() {
this.echartsInit()
},
methods:{
handleChange(value) {
console.log(`selected ${value}`);
},
handleBlur() {
console.log('blur');
},
handleFocus() {
console.log('focus');
},
filterOption(input, option) {
return (
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
);
},
echartsInit() {
let myEcharts = echarts.init(document.getElementById("myItemCost"))
let option ={
@ -60,11 +83,12 @@ export default {
},
xAxis: {
type: 'category',
data: ["1","2","3","4","5","6","7","8","9","10","11","12"],
data: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
// show: false,
axisLine: {
show: false,
lineStyle: {
color: '#070707', //x轴的颜色
color: '#878686', //x轴的颜色
// width: 8, //轴线的宽度
},
@ -73,8 +97,9 @@ export default {
yAxis: {
type: 'value',
axisLine: {
show: false,
lineStyle: {
color: '#050505', //x轴的颜色
color: '#8d8b8b', //x轴的颜色
// width: 8, //轴线的宽度
},
},
@ -90,14 +115,34 @@ export default {
{
data: [10, 20, 40, 40, 50, 60,60,70,25,56,23,23], //对应每一个X坐标的值
type: 'line',
// itemStyle: {
// normal: {
// color: '#7b7777', //改变折线点的颜色
// lineStyle: {
// color: '#1ad933' //改变折线颜色
// }
// }
// },
areaStyle: {},
showSymbol: false,
// color:'#bfbcbc',
itemStyle: {
normal: {
color: '#7b7777', //改变折线点的颜色
// color: '#7b7777', //改变折线点的颜色
color:new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
offset: 0,
color: 'rgb(210,223,255)'
}, {
offset: 1,
color: 'rgb(253,253,255)'
}]),
lineStyle: {
color: '#1ad933' //改变折线颜色
color: 'rgb(52,112,255)' //改变折线颜色
}
}
},
smooth: true
}
]
};

38
src/views/statisticanalysis/costecharts/OnDayCost.vue
Unescape View File

@ -1,26 +1,23 @@
<template>
<!-- <div>当日成本</div>-->
<div style=" width: 95%;height: 100%;">
<div style=" width: 100%;height: 28%;display: flex;align-items: center;justify-content:flex-start;padding-left: 8%">
<div style="">
<div style="font-size: 19px">
<div style=" width: 95%;height: 100%;background-color: #56a1ec;border-radius: 10px">
<div style=" width: 100%;height: 28%;padding-left: 6%">
<div style="padding-top: 2%">
<div style="font-size: 30px;color: #d1e9ff">
<!-- <div style="color: #ffffff;font-size: 19px">-->
当日成本
当日成本 （元）
</div>
<span style="">元</span>
<!-- <span style="">元</span>-->
<!-- <span style="color: #ffffff">元</span>-->
</div>
<div style="flex: 1;display: flex;align-items: center;justify-content: space-evenly;height: 80px;margin-top: 5%;width: 50% ">
<div class="wen" >1</div>
<div class="wen">2</div>
<div class="wen">3</div>
<div class="wen">4</div>
<div class="wen">5</div>
<div style="height: 80px;margin-top: 5%;">
<div class="wen" >￥ 12312.45 </div>
<!-- <div class="wen">2</div>-->
</div>
</div>
<div id="myOnDayCost" style="width: 85%; height: 70%"></div>
<!-- <div id="myOnDayCost" style="width: 85%; height: 70%"></div>-->
</div>
<!-- <chart-card :loading="loading" title="订单量" :total="8846">-->
@ -37,6 +34,7 @@
<script>
import * as echarts from 'echarts';
import ChartCard from '@/components/ChartCard'
import '@/assets/less/TableExpand.less'
export default {
name: "OnDayCost",
@ -49,7 +47,7 @@ name: "OnDayCost",
}
},
mounted() {
this.echartsInit()
// this.echartsInit()
},
methods:{
echartsInit() {
@ -220,14 +218,14 @@ name: "OnDayCost",
<style scoped>
.wen{
width: 15%;
/*width: 15%;*/
height: 100%;
/*margin-left: 6%;*/
text-align:center;
font-size: 52px;
color: #0fc407;
/*margin-left: 3%;*/
/*text-align:center;*/
font-size: 45px;
color: #fafafa;
/*padding-top: 2%;*/
/*align-items: center;*/
border: 2px solid #0fc407;
/*border: 2px solid #0fc407;*/
}
</style>
Write Preview
Loading…
Cancel
Save