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

Merge remote-tracking branch 'origin/dev' into dev

dev
caoyizhong 2 years ago
parent
41023a16c1 13bab9c1dc
commit
a3ffefb94f
9 changed files with 279 additions and 249 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. 13
      common/common.js
  2. 3
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  3. 3
      src/views/activiti/form/ProcessMaterialsAllotForm.vue
  4. 3
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
  5. 3
      src/views/activiti/form/ProcessSmaterialsScrapForm.vue
  6. 3
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  7. 489
      src/views/gunpowder/ProcessIndustrialExplosiveList.vue
  8. 6
      src/views/gunpowder/ProcessIndustrialExplosiveLists.vue
  9. 5
      src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue

13
common/common.js
Unescape View File

@ -10,3 +10,16 @@ export function cachePage(e) {
localStorage.setItem(e, JSON.stringify(page))
}
}
// 乘法计算
export function accMul(arg1, arg2) {
let m = 0
let s1 = arg1.toString()
let s2 = arg2.toString()
try {
m += s1.split('.')[1] ? s1.split('.')[1].length : ''
} catch (e) {}
try {
m += s2.split('.')[1] ? s2.split('.')[1].length : ''
} catch (e) {}
return (Number(s1.replace('.', '')) * Number(s2.replace('.', ''))) / Math.pow(10, m)
}

3
src/views/activiti/form/ProcessMaterialWarehousingForm.vue
Unescape View File

@ -162,6 +162,7 @@
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JSelectItem from '@/components/jeecgbiz/JSelectItem'
import { accMul } from '../../../../common/common'
export default {
name: 'ProcessMaterialWarehousingForm',
@ -478,7 +479,7 @@
{
rowKey: record.row.id,
values: {
'materialAmount': parseFloat((record.row.materialPrice * record.row.materialQuantity).toFixed(1)),
'materialAmount': accMul(record.row.materialPrice,record.row.materialQuantity)
}
}
]

3
src/views/activiti/form/ProcessMaterialsAllotForm.vue
Unescape View File

@ -137,6 +137,7 @@
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import DEditableTable from '@comp/jeecg/DEditableTable'
import { accMul } from '../../../../common/common'
export default {
name: 'ProcessMaterialsAllotForm',
@ -741,7 +742,7 @@
// 'materialPrice': res.price,
'allotSendNumber': res.allotSendNumber,
'allotNumber': res.allotNumber,
'materialAmount': parseFloat((res.materialPrice * parseInt( !res.allotSendNumber ? 0 : res.allotSendNumber)).toFixed(1)),
'materialAmount': accMul(res.materialPrice,!res.allotSendNumber ? 0 : res.allotSendNumber),
}
}
]

3
src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
Unescape View File

@ -150,6 +150,7 @@
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
import { accMul } from '../../../../common/common'
export default {
name: 'ProcessMaterialsDeliveryForm',
@ -856,7 +857,7 @@
// 'materialPrice': res.materialPrice,
'actualSendNumber': res.actualSendNumber,
'pleaseSendNumber': res.pleaseSendNumber,
'materialAmount': res.materialPrice * res.actualSendNumber
'materialAmount': accMul(res.materialPrice,res.actualSendNumber)
}
}
]

3
src/views/activiti/form/ProcessSmaterialsScrapForm.vue
Unescape View File

@ -109,6 +109,7 @@
import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
import BEditableTable from '@comp/jeecg/BEditableTable'
import moment from 'moment'
import { accMul } from '../../../../common/common'
export default {
name: 'ProcessSmaterialsScrapForm',
@ -465,7 +466,7 @@
rowKey: record.row.id,
values: {
'scrapNumber': record.row.scrapNumber > 0 ? record.row.scrapNumber : 1 ,
'materialAmount': record.row.scrapNumber * record.row.materialPrice > 0 ? record.row.scrapNumber * record.row.materialPrice : 1 * record.row.materialPrice,
'materialAmount': accMul(record.row.scrapNumber,record.row.materialPrice) > 0 ? accMul(record.row.scrapNumber,record.row.materialPrice) : 1 * record.row.materialPrice,
},
},
]

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

@ -213,6 +213,7 @@
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JEditor from '@/components/jeecg/JEditor'
import { queryDepartTreeList } from '@api/api'
import { accMul } from '../../../../common/common'
// const columns = [
// {
@ -1084,7 +1085,7 @@
'materialSeries': record.row.materialSeries,
'materialName': record.row.materialName,
'materialUnit': record.row.materialUnit,
'materialAmount': parseFloat((record.row.materialQuantity * record.row.materialPrice).toFixed(1)),
'materialAmount': accMul(record.row.materialQuantity,record.row.materialPrice),
'materialType': this.data.materialType
}
}

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

@ -5,26 +5,27 @@
<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-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>
@ -33,21 +34,24 @@
<!-- 操作按钮区域 -->
<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 @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>-->
<!-- <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-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>
@ -61,7 +65,7 @@
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
:scroll="{y:600}"
bordered
rowKey="id"
:columns="columns"
@ -77,7 +81,7 @@
</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;"/>
<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>
@ -92,24 +96,25 @@
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<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 slot="action" slot-scope="text, record" style="overflow: hidden;" class="table-page-search-submitButtons">
<a-dropdown>
<a class="ant-dropdown-link" @click="handleDetaills(record)"><a-icon type="transaction" /> 明细</a>
</a-dropdown>
<!-- <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>
@ -121,206 +126,206 @@
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ProcessIndustrialExplosiveModal from './modules/ProcessIndustrialExplosiveModal'
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' }
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
}
],
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}`;
// {
// 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: {
handleDetaills(record) {
console.log('record>>>>>>>>>>>>>>', record)
this.$router.push({
// name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',
// params:{
// item: record.merchandiseNewsId,
// merchandiseName : ' - '+record.merchandiseName.substring(0,record.merchandiseName.lastIndexOf(" "))
// }
path: '/modules/gunpowder_detail',
query: {
item: record.merchandiseNewsId,
merchandiseName: ' - ' + record.pyrotechnicsName.substring(0, 10)
}
})
},
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(){
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
}
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';
@import '~@assets/less/common.less';
</style>

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

@ -275,6 +275,12 @@ export default {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
watch: {
$route() {
this.queryParam.merchandiseNewsId = this.$route.query.item
this.loadData()
}
},
methods: {
initDictConfig(){
},

5
src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue
Unescape View File

@ -140,6 +140,7 @@
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import { accMul } from '../../../../common/common'
export default {
name: 'ProcessWasteMaterialsForm',
@ -261,7 +262,7 @@
console.log(values.materialPrice) // { username: '' }
if(!!values.materialPrice){
this.form.setFieldsValue({
materialAmount: values.materialPrice * sVal
materialAmount: accMul(values.materialQuantity,sVal)
})
}
})
@ -275,7 +276,7 @@
console.log(values.materialQuantity); // { username: '' }
if(!!values.materialQuantity){
this.form.setFieldsValue({
materialAmount: values.materialQuantity * sVal
materialAmount: accMul(values.materialQuantity,sVal)
})
}
})

Write Preview
Loading…
Cancel
Save