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

添加调拨页面

dev
caoyizhong 2 years ago
parent
075359fedd
commit
14c573c9e8
11 changed files with 2303 additions and 3 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. 276
      src/components/jeecg/GPlan.vue
  2. 620
      src/components/jeecg/modal/ProcessRestore.vue
  3. 14
      src/views/activiti/applyHome.vue
  4. 6
      src/views/activiti/mixins/activitiMixin.js
  5. 98
      src/views/burst/form/purchase/ProcessIndustrialAllot.vue
  6. 447
      src/views/burst/form/purchase/ProcessIndustrialAllotForm.vue
  7. 61
      src/views/burst/form/purchase/ProcessIndustrialAllotModal.vue
  8. 100
      src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue
  9. 183
      src/views/burst/form/subTables/ProcessIndustrialAllotMaterialSubTable.vue
  10. 220
      src/views/burst/form/subTables/ProcessIndustrialRestoreMaterialSubTable.vue
  11. 281
      src/views/burst/list/purchaseList/ProcessIndustrialAllotList.vue

276
src/components/jeecg/GPlan.vue
Unescape View File

@ -0,0 +1,276 @@
<template>
<div class="components-input-demo-presuffix" v-if="avalid">
<!---->
<a-input @click="openModal" :placeholder="placeholder" v-model="showText.vals" >
<a-icon slot="prefix" type="cluster" :title="title"/>
<a-icon v-if="showText" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
</a-input>
<process-restore
ref="ProcessStorage"
:code="code"
:multi="multi"
:groupId="uniqGroupId"
:param="param"
@ok="callBack"
/>
</div>
</template>
<script>
import { getAction } from '@/api/manage'
import ProcessRestore from '@comp/jeecg/modal/ProcessRestore'
export default {
name: 'GPlan',
components: {
ProcessRestore,
},
props: {
code: {
type: String,
default: '',
required: false
},
field: {
type: String,
default: '',
required: false
},
orgFields: {
type: String,
default: '',
required: false
},
destFields: {
type: String,
default: '',
required: false
},
width: {
type: Number,
default: 1200,
required: false
},
placeholder: {
type: String,
default: '请选择',
required: false
},
value: {
type: String,Object,Number,Array,
required: false
},
triggerChange: {
type: Boolean,
required: false,
default: false
},
disabled: {
type: Boolean,
required: false,
default: false
},
multi: {
type: Boolean,
required: false,
default: false
},
//popup动态参数 支持系统变量语法
param:{
type: Object,
required: false,
default: ()=>{}
},
/** 分组ID，用于将多个popup的请求合并到一起，不传不分组 */
groupId: String
},
data() {
return {
showText: {
ids:[],
vals:''
},
title: '',
avalid: true,
url: {
list: '/hy/processUdgetPlan/listByplan',
delete: '/hy/processUdgetPlan/delete',
deleteBatch: '/hy/processUdgetPlan/deleteBatch',
exportXlsUrl: '/hy/processUdgetPlan/exportXls',
importExcelUrl: 'hy/processUdgetPlan/importExcel'
},
}
},
computed: {
uniqGroupId() {
if (this.groupId) {
let { groupId, code, field, orgFields, destFields } = this
return `${groupId}_${code}_${field}_${orgFields}_${destFields}`
}
}
},
watch: {
value: {
immediate: true,
handler: function(val) {
// console.log(val,'4444444444444444444')
if (!val) {
this.showText = ''
} else {
this.showText = val
/*if (Array.isArray(JSON.parse(val))){
this.showText=JSON.parse(val)[0]
}*/
this.showTextVal()
}
}
}
},
created() {
},
mounted() {
if (!this.orgFields || !this.destFields || !this.code) {
this.$message.error('popup参数未正确配置!')
this.avalid = false
}
if (this.destFields.split(',').length != this.orgFields.split(',').length) {
this.$message.error('popup参数未正确配置,原始值和目标值数量不一致!')
this.avalid = false
}
},
methods: {
showTextVal(){
getAction("/hy/processUdgetPlan/queryById", {id:this.showText}).then((res) => {
if (res.success) {
// console.log(res.result)
let params={}
params.ids=[];
params.vals=[];
params.ids.push(res.result.id)
params.vals.push(res.result.warehousingBatch)
params.vals=params.vals.join(",")
this.showText=params;
let dataList=[];
let data={}
data.id=res.result.id;
dataList.push(data)
this.$emit('PlanIds', dataList)
}
if (res.code === 510) {
this.$message.warning(res.message)
}
this.loading = false
})
},
openModal() {
if (this.showText){
this.$refs.ProcessStorage.show(this.showText);
}else {
if (this.disabled === false) {
this.$refs.ProcessStorage.show(null);
}
}
},
getID(){
this.showText
},
handleEmpty() {
this.showText = ''
let destFieldsArr = this.destFields.split(',')
if (destFieldsArr.length === 0) {
return
}
let res = {}
for (let i = 0; i < destFieldsArr.length; i++) {
res[destFieldsArr[i]] = ''
}
if (this.triggerChange) {
this.$emit('callback', res)
} else {
this.$emit('input', '', res)
}
},
callBack(rows) {
// console.log("-=-=-=-==",rows);
let orgFieldsArr = this.orgFields.split(',')
let destFieldsArr = this.destFields.split(',')
let resetText = false
if (this.field && this.field.length > 0) {
// console.log(this.field.length,"this.field.length")
this.showText = ''
resetText = true
}
let res = {}
if (orgFieldsArr.length > 0) {
for (let i = 0; i < orgFieldsArr.length; i++) {
let tempDestArr = []
for(let rw of rows){
let val = rw[orgFieldsArr[i]]
if(!val){
val = ""
}
// console.log(val,"这是什么鬼")
tempDestArr.push(val)
}
res[destFieldsArr[i]] = tempDestArr.join(",")
}
if (resetText === true) {
let params={};
params.ids=[];
params.vals=[];
for(let rw of rows){
// console.log(rw,"11111111111111111111")
if(!rw){
rw = ""
}
params.ids.push(rw.id)
params.vals.push(rw.warehousingBatch)
}
params.vals=params.vals.join(",")
// console.log(params,"*-*-*-*-*-*-*-")
this.showText = params
}else {
// console.log("222222222222222222")
this.showText =rows[0].id
}
// update--end--autor:lvdandan-----date:20200630------for：多选时未带回多个值------
}
if (this.triggerChange) {
//v-dec时即triggerChange为true时 将整个对象给form页面 让他自己setFieldsValue
this.$emit('callback', rows[0].id)
this.$emit('mounted', rows)
this.$emit('callType', rows[0])
// console.log(rows,"选中的数据-----1111111111111111111")
} else {
//v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值
// this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]])
// console.log(rows,"选中的数据")
this.$emit('input', this.showText, rows[0])
this.$emit('mounted', rows)
this.$emit('callType', rows[0])
}
}
}
}
</script>
<style scoped>
.components-input-demo-presuffix .anticon-close-circle {
cursor: pointer;
color: #ccc;
transition: color 0.3s;
font-size: 12px;
}
.components-input-demo-presuffix .anticon-close-circle:hover {
color: #f5222d;
}
.components-input-demo-presuffix .anticon-close-circle:active {
color: #666;
}
</style>

620
src/components/jeecg/modal/ProcessRestore.vue
Unescape View File

@ -0,0 +1,620 @@
<template>
<j-modal
:title="title"
:width="modalWidth"
:visible="visible"
:confirmLoading="confirmLoading"
switchFullscreen
wrapClassName="j-popup-modal"
@ok="handleSubmit"
@cancel="handleCancel"
cancelText="关闭">
<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="24">
<a-form-item label="物资类型">
<j-dict-select-tag type="list" v-model="queryParam.type" dictCode="explosive_type"
placeholder="请选择物资类型" />
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker
format="YYYY-MM-DD"
:value="processTime"
:placeholder="['开始时间', '结束时间']"
@change="processDateChange"
/>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24" :hidden="showdw">
<a-form-item label="流程发起部门">
<a-select v-model="queryParam.departId" placeholder="请输入项目部" @mouseenter="getUnit" >
<a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.id">{{item.departName}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="流程计划">
<j-dict-select-tag type="list" v-model="queryParam.processPlan" dictCode="process_plan"
placeholder="请选择计划类型" />
</a-form-item>
</a-col>
<!--<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="需求时间">
<j-date placeholder="请选择需求时间" v-model="queryParam.needTime"></j-date>
</a-form-item>
</a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<span style="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 -->
<!--&lt;!&ndash; 操作按钮区域 &ndash;&gt;
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('预算计划采购流程')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
&lt;!&ndash; 高级查询区域 &ndash;&gt;
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
</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">{{-->
<!-- this.selectedRowKeys.length }}</a>项-->
<!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
<!-- </div>-->
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
class="j-table-force-nowrap"
:scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
:customRow="clickThenSelect"
@change="handleTableChange">
<span slot="describes" slot-scope="text, record">
<j-ellipsis :value="text" :length="20"/>
</span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt=""
style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<!-- <template slot="fileOn" slot-scope="text">-->
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
<!-- <a-button-->
<!-- v-else-->
<!-- :ghost="true"-->
<!-- type="primary"-->
<!-- size="small"-->
<!-- @click="onlineFile(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-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<a-tabs defaultActiveKey="1">
<a-tab-pane tab="预算计划采购流程物料清单表" key="1">
<ProcessIndustrialPurchaseMaterialSubTable :mainId="selectedRowKeys"/>
</a-tab-pane>
<!-- <a-tab-pane tab="预算计划采购流程物料已入清单表" key="2">-->
<!-- <ProcessMaterialWarehousingListList :mainId="selectedMainId" />-->
<!-- </a-tab-pane>-->
<!-- <a-tab-pane tab="预算计划采购流程物料已申请清单表" key="3">-->
<!-- <ProcessMaterialWarehousingApplyiList :mainId="selectedMainId" />-->
<!-- </a-tab-pane>-->
</a-tabs>
</a-card>
</j-modal>
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@/api/manage'
import { filterObj } from '@/utils/util'
import ProcessIndustrialPurchaseMaterialSubTable from '@views/burst/form/subTables/ProcessIndustrialPurchaseMaterialSubTable'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
import '@/assets/less/TableExpand.less'
import { ajaxGetDictItems, getDictItemsFromCache } from '@api/api'
const MODAL_WIDTH = 1600
export default {
name: 'ProcessRestore',
props: ['multi', 'code', 'groupId', 'param'],
components: {
ProcessIndustrialPurchaseMaterialSubTable,
JSuperQuery,
JDictSelectTag
},
mixins: [JeecgListMixin],
data() {
return {
showdw: true,
visible: false,
confirmLoading: false,
title: '预算计划采购流程管理列表',
description: '预算计划采购流程管理页面',
queryParam: {},
dataSourceList:[{warehousingBatch:23}],
// 表头
columns: [
{
title: '流程编号',
align: 'center',
dataIndex: 'warehousingBatch'
},
{
title: '流程提示',
align: 'center',
scopedSlots: { customRender: 'describes' },
dataIndex: 'describes'
},
// {
// title: '采购类型',
// align: 'center',
// dataIndex: 'planType'
// },
{
title: '流程发起公司',
align: 'center',
dataIndex: 'company'
},
{
title: '流程发起时间',
align: 'center',
dataIndex: 'createTime'
},
{
title: '流程发起部门',
align: 'center',
dataIndex: 'departId'
},
{
title: '流程发起人',
align: 'center',
dataIndex: 'createBy'
},
{
title: '物资类型',
align: 'center',
dataIndex: 'materialType'
},
{
title: '流程计划',
align: 'center',
dataIndex: 'processPlan'
},
{
title: '需求时间',
align: 'center',
dataIndex: 'needTime',
customRender: function(text) {
return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
}
},
// {
// title: '顺序号',
// align: 'center',
// dataIndex: 'orderNumber'
// }
/* {
title: '文件id',
align: 'center',
dataIndex: 'fileId',
scopedSlots: { customRender: 'fileSlot' }
}*/
],
url: {
listByuntil: '/unitwaste/processUnitWasteWarehouseCode/listAll',
list: '/burst/processIndustrialPurchase/listByplan',
delete: '/hy/processUdgetPlan/delete',
deleteBatch: '/hy/processUdgetPlan/deleteBatch',
exportXlsUrl: '/hy/processUdgetPlan/exportXls',
importExcelUrl: 'hy/processUdgetPlan/importExcel'
},
dictOptions: {
company: [],
sysOrgCode: [],
materialType: [],
processPlan: []
},
/* 分页参数 */
ipagination:{
current: 1,
pageSize: 5,
pageSizeOptions: ['5', '10', '50'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 共" + total + "条"
},
showQuickJumper: true,
showSizeChanger: true,
total: 0
},
selectedMainId: '',
materialWarehousingListID: undefined,
superFieldList: [],
selectedRowKeys: [],
modalWidth: MODAL_WIDTH,
changeData: '',
getFileData: false,
//部门查询
queryParamsUntil:[],
//时间相关查询
processTime:[],
labelCol: {
xs: { span: 4 },
sm: { span: 4 },
},
wrapperCol: {
xs: { span: 20 },
sm: { span: 20 },
},
}
},
mounted() {
//this.loadColumnsInfo()
},
created() {
this.showDepart();
this.initDictConfig();
},
watch: {},
computed: {
showSearchFlag() {
return this.queryInfo && this.queryInfo.length > 0
}
},
methods: {
//是否隐藏流程发起部门查询
showDepart(){
let ue= sessionStorage.getItem('USER_INFORMATION');
let res=JSON.parse(ue);
if(res.realname == "管理员"){
this.showdw = false;
}
},
//流程发起时间
processDateChange: function (value, dateString) {
this.processTime = value
this.queryParam.processTimeBegin=dateString[0];
this.queryParam.processTimeEnd=dateString[1];
console.log(this.queryParam)
},
//加載項目部
getUnit(){
getAction(this.url.listByuntil).then((res) => {
if (res.success) {
this.queryParamsUntil = res.result.records||res.result;
console.log(this.queryParamsUntil)
}
})
},
initDictConfig(){
// initDictOptions('sys_depart,depart_name,id').then((res) => {
// if (res.success) {
// this.$set(this.dictOptions, 'company', res.result)
// }
// })
// initDictOptions('sys_depart,depart_name,id').then((res) => {
// if (res.success) {
// this.$set(this.dictOptions, 'sysOrgCode', res.result)
// }
// })
//优先从缓存中读取字典配置
if(getDictItemsFromCache('explosive_type')){
this.Globaler.dictOptions = getDictItemsFromCache('explosive_type');
// console.log(this.dictOptions);
return;
}
//根据字典Code, 初始化字典数组
ajaxGetDictItems('explosive_type', null).then((res) => {
if (res.success) {
// console.log(res.result);
this.Globaler.dictOptions = res.result;
}
})
},
onClearSelected() {
this.selectedRowKeys = []
this.selectionRows = []
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
console.log("selectedRowKeys>>>>>>>>>>>>>>>",selectedRowKeys)
console.log("selectionRows>>>>>>>>>>>>>>>>>>>",selectionRows)
this.selectedMainId = selectedRowKeys[0]
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
},
loadData(arg) {
if(!this.url.list){
this.$message.error("请设置url.list属性!")
return
}
//加载数据 若传入参数1则加载第一页的内容
if (arg === 1) {
this.ipagination.current = 1;
}
this.onClearSelected()
var params = this.getQueryParams();//查询条件
let ue= sessionStorage.getItem('USER_INFORMATION');
let res=JSON.parse(ue);
// console.log("-=-=-==-123",res);
if(res.realname !== "管理员"){
if(!!res.departIds){
params.departId = res.departIds ;
}else{
return ;
}
}
this.loading = true;
// console.log("12341234",params);
getAction(this.url.list, params).then((res) => {
if (res.success) {
this.dataSource = res.result;
// console.log("执行主席",this.dataSource,this.Globaler.dictOptions);
// console.log("执行主席",this.dataSource,res.result);
this.ipagination.total = res.result.total;
this.dataSource.forEach(item =>{
this.Globaler.dictOptions.forEach(it =>{
if(item.materialType === parseInt( it.value ) ){
item.materialType = it.text;
}
})
})
}
if(res.code===510){
this.$message.warning(res.message)
}
this.loading = false;
})
},
clickThenSelect(record) {
return {
on: {
click: () => {
this.onSelectChange(record.id.split(','), [record])
}
}
}
},
queryParams() {
let paramTarget = {}
if (this.dynamicParam) {
//处理自定义参数
Object.keys(this.dynamicParam).map(key => {
paramTarget['self_' + key] = this.dynamicParam[key]
})
}
let param = Object.assign(paramTarget, this.queryParam, this.sorter)
param.pageNo = this.pagination.current
param.pageSize = this.pagination.pageSize
return filterObj(param)
},
handleChangeInTableSelect(selectedRowKeys, selectionRows) {
//update-begin-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
if (!selectedRowKeys || selectedRowKeys.length == 0) {
this.table.selectionRows = []
} else if (selectedRowKeys.length == selectionRows.length) {
this.table.selectionRows = selectionRows
} else {
//当两者长度不一的时候 需要判断
let keys = this.table.selectedRowKeys
let rows = this.table.selectionRows
//这个循环 添加新的记录
for (let i = 0; i < selectionRows.length; i++) {
let combineKey = this.combineRowKey(selectionRows[i])
if (keys.indexOf(combineKey) < 0) {
//如果 原来的key 不包含当前记录 push
rows.push(selectionRows[i])
}
}
//这个循环 移除取消选中的数据
this.table.selectionRows = rows.filter(item => {
let combineKey = this.combineRowKey(item)
return selectedRowKeys.indexOf(combineKey) >= 0
})
}
//update-end-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
this.table.selectedRowKeys = selectedRowKeys
},
handleChangeInTable(pagination, filters, sorter) {
//分页、排序、筛选变化时触发
if (Object.keys(sorter).length > 0) {
this.sorter.column = sorter.field
this.sorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
}
this.table.pagination = pagination
this.loadData()
},
handleCancel() {
this.close()
},
handleSubmit() {
/*if (this.getFileData) {
this.$emit('close')
this.visible = false
return
}*/
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>',this.changeData)
// if (!this.multi) {
// if (this.selectionRows && this.selectionRows.length > 1) {
// this.$message.warning('请选择一条记录')
// return false
// }
// }
if (!this.selectionRows || this.selectionRows.length == 0) {
if (this.getFileData){
this.$emit('close')
this.visible = false
return
}
this.$message.warning('请选择一条记录')
return false
}
this.$emit('ok', this.selectionRows)
this.close()
},
close() {
this.$emit('close')
this.visible = false
//this.onClearSelected()
},
show(val) {
this.visible = true
if (val) {
this.getFileData = true
let data = []
data.push(val.ids[0])
this.changeData = data
// this.loadPlan(1)
}
},
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
searchByquery() {
//this.loadData(1);
},
onlyReload() {
//this.loadData();
},
searchReset() {
this.processTime=[]
Object.keys(this.queryParam).forEach(key => {
this.queryParam[key] = ''
})
this.loadData(1);
},
combineRowKey(record) {
let res = ''
Object.keys(record).forEach(key => {
res += record[key]
})
if (res.length > 50) {
res = res.substring(0, 50)
}
return res
},
clickThenCheck(record) {
return {
on: {
click: () => {
let rowKey = this.combineRowKey(record)
if (!this.table.selectedRowKeys || this.table.selectedRowKeys.length == 0) {
let arr1 = [], arr2 = []
arr1.push(record)
arr2.push(rowKey)
this.table.selectedRowKeys = arr2
this.table.selectionRows = arr1
} else {
if (this.table.selectedRowKeys.indexOf(rowKey) < 0) {
this.table.selectedRowKeys.push(rowKey)
this.table.selectionRows.push(record)
} else {
let rowKey_index = this.table.selectedRowKeys.indexOf(rowKey)
this.table.selectedRowKeys.splice(rowKey_index, 1)
this.table.selectionRows.splice(rowKey_index, 1)
}
}
}
}
}
},
//防止字典中有垃圾数据
initDictOptionData(dictOptions) {
let obj = {}
Object.keys(dictOptions).map(k => {
obj[k] = dictOptions[k].filter(item => {
return item != null
})
})
this.dictOptions = obj
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
/deep/.ant-modal {
/*overflow-y: hidden;*/
width: 80% !important;
height: 93%;
top:45px
}
/deep/.ant-modal-content{
height: 100%;
/*overflow-y: hidden;*/
overflow-y: scroll;
}
/deep/.ant-modal-body{
/*height: 100%;*/
/*overflow-y: scroll;*/
}
</style>

14
src/views/activiti/applyHome.vue
Unescape View File

@ -166,6 +166,20 @@
<br/>
<b>说明：</b>{{item.description}}-->
</a-card>
<a-card v-if="item.name=='民爆调拨流程'" v-has="'industrial:allot'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">
<div slot="title">
<a-row style="text-align: center;">
<!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
<!--<a-col span="12" style="text-align: center;">-->
<a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>
<!-- <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
<!--</a-col>-->
</a-row>
</div>
<!-- <b>版本：</b>v.{{item.version}}
<br/>
<b>说明：</b>{{item.description}}-->
</a-card>
</template>
</a-list>
</a-collapse-panel>

6
src/views/activiti/mixins/activitiMixin.js
Unescape View File

@ -110,9 +110,9 @@ export const activitiMixin = {
},
{
text:'民爆调拨流程',
routeName:'@/views/burst/form/purchase/ProcessIndustrialPurchase5',
component:() => import(`@/views/burst/form/purchase/ProcessIndustrialPurchase`),
businessTable:'process_industrial_purchase5'
routeName:'@/views/burst/form/purchase/ProcessIndustrialAllot',
component:() => import(`@/views/burst/form/purchase/ProcessIndustrialAllot`),
businessTable:'Process_industrial_allot'
},
]

98
src/views/burst/form/purchase/ProcessIndustrialAllot.vue
Unescape View File

@ -0,0 +1,98 @@
<template>
<a-card :bordered="false" style="text-align: center;background-color: #f3f3f3">
<a-tabs>
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-industrial-allot-form :isNew="isNew" :processData="processData" :disabled="disabled" :hieg="hieg"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" :allotShuNumber = "allotShuNumber"
@backTask="backTask" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
<a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
</a-tabs>
</a-card>
</template>
<script>
import ProcessIndustrialAllotForm from '@views/burst/form/purchase/ProcessIndustrialAllotForm'
import historicPictrue from '@/views/activiti/historicPictrue'
import historicDetail from '@/views/activiti/historicDetail'
export default {
name: 'ProcessIndustrialAllot',
components: { ProcessIndustrialAllotForm, historicPictrue, historicDetail },
data() {
return {}
},
props: {
hieg: {
type: Boolean,
default: true,
required: false
},
//表单禁用
allotShuNumber: {
type: Boolean,
default: true, //默认值
required: false //必传值
},
/*流程数据*/
isNew: { type: Boolean, default: false, required: false },
task: { type: Boolean, default: false, required: false },
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
pictureId: {
type: String,
default: '',
required: true
},
procInstId: {
type: String,
default: '',
required: true
},
disabled: {
type: Boolean,
default: false,
required: false
}
},
created() {
// console.log("=323-3=",this.allotShuNumber);
},
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
},
close() {
//todo 关闭后的回调
this.$emit('close')
},
/*通过审批*/
passTask() {
this.$emit('passTask')
},
/*驳回审批*/
backTask() {
this.$emit('backTask')
},
loadData() {
this.$emit('loadData')
}
}
}
</script>
<style scoped>
</style>

447
src/views/burst/form/purchase/ProcessIndustrialAllotForm.vue
Unescape View File

@ -0,0 +1,447 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<!-- 主表单区域 -->
<a-form ref="form" :form="form" slot="detail">
<a-row>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planType">
<j-select-user-by-dep v-decorator="['createBy']" disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
<!-- <a-input v-model="model.company" placeholder="请输入流程发起公司" ></a-input>-->
<j-select-company v-decorator="['company']" multi disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId">
<!-- <a-input v-model="model.departId" placeholder="请输入流程发起部门" ></a-input>-->
<j-select-depart v-decorator="['departId']" multi disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialType">
<!-- <a-input-number v-model="model.materialType" placeholder="请输入物资类型" style="width: 100%" />-->
<j-dict-select-tag type="list" v-decorator="['type',validatorRules.materialType]"
dictCode="explosive_type" :trigger-change="true"
placeholder="请选择物资类型" @change="elect" />
</a-form-model-item>
</a-col>
<!-- <a-col :xs="24" :sm="8">-->
<!-- <a-form-model-item label="被调拨目标库(单位Id)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="targetLibrary">-->
<!-- <a-input v-model="model.targetLibrary" placeholder="请输入被调拨目标库(单位Id)" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :xs="24" :sm="8">-->
<!-- <a-form-model-item label="被调拨部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="beAllotDepartment">-->
<!-- <a-input v-model="model.beAllotDepartment" placeholder="请输入被调拨部门" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :xs="24" :sm="8">
<a-form-model-item label="调拨批次号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehousingBatch">
<!-- <a-input v-model="model.warehousingBatch" placeholder="请输入调拨批次号" ></a-input>-->
<a-input v-decorator="['warehousingBatch']" placeholder="请输入调拨批次号" ></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :xs="24" :sm="8">-->
<!-- <a-form-model-item label="描述信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="describes">-->
<!-- <a-textarea v-decorator="['describes']" rows="4" placeholder="请输入描述信息" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :xs="24" :sm="8">
<a-form-model-item label="文件id" :labelCol="labelCol3" :wrapperCol="wrapperCol3" prop="fileId">
<!-- <a-input v-model="model.fileId" placeholder="请输入文件id" ></a-input>-->
<!-- <a-input v-model="model.fileId" placeholder="请输入文件id" ></a-input>-->
<j-upload v-decorator="['fileId']" style="z-index: 999"></j-upload>
</a-form-model-item>
</a-col>
<!-- <a-col :xs="24" :sm="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 :xs="24" :sm="8">-->
<!-- <a-form-model-item label="流程状态描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="actStatus">-->
<!-- <a-input v-model="model.actStatus" placeholder="请输入流程状态描述" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :xs="24" :sm="8">-->
<!-- <a-form-model-item label="流程描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="opinion">-->
<!-- <a-textarea v-decorator="['opinion']" rows="4" placeholder="请输入流程描述" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :xs="24" :sm="8">-->
<!-- <a-form-model-item label="流程id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">-->
<!-- <a-input v-model="model.processId" placeholder="请输入流程id" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :xs="24" :sm="8">-->
<!-- <a-form-model-item label="流程判断条件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="haveAndNot">-->
<!-- <a-input-number v-model="model.haveAndNot" placeholder="请输入流程判断条件" style="width: 100%" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
</a-row>
</a-form>
</j-form-container>
<!-- 子表单区域 -->
<a-tabs v-model="activeKey" @change="handleChangeTabs">
<a-tab-pane tab="民爆调拨详情记录表" :key="refKeys[0]" :forceRender="true">
<j-editable-table
:ref="refKeys[0]"
:loading="processIndustrialAllotMaterialTable.loading"
:columns="processIndustrialAllotMaterialTable.columns"
:dataSource="processIndustrialAllotMaterialTable.dataSource"
:maxHeight="300"
:disabled="formDisabled"
:rowNumber="true"
:rowSelection="true"
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
</a-spin>
</template>
<script>
import { FormTypes,getRefPromise,VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
import { getCurrentTime } from '@api/manage'
import pick from 'lodash.pick'
export default {
name: 'ProcessIndustrialAllotForm',
mixins: [JEditableTableMixin],
components: {
JFormContainer,
JDate,
JUpload,
JSelectDepart,
JSelectUserByDep,
JDictSelectTag,
JSelectCompany
},
data() {
return {
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
labelCol3: {
xs: { span: 24 },
sm: { span: 6 }
},
wrapperCol3: {
xs: { span: 24 },
sm: { span: 5 }
},
model:{
},
validatorRules: {
materialType: { rules:[
{ required: true, message: '请选择物资类型!'},
]},
},
// 新增时子表默认添加几行空数据
addDefaultRowNum: 1,
refKeys: ['processIndustrialAllotMaterial', ],
tableKeys:['processIndustrialAllotMaterial', ],
activeKey: 'processIndustrialAllotMaterial',
// 民爆调拨详情记录表
processIndustrialAllotMaterialTable: {
loading: false,
dataSource: [],
columns: [
{
title: '物料组id（物料清单ID）',
key: 'materialGroup',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '物料编号',
key: 'equipment',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: 'WBS',
key: 'wbs',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '物料名称及规格型号',
key: 'materialName',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '单位',
key: 'materialUnit',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '调拨数量',
key: 'allotNumber',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '调拨目标',
key: 'allotTarget',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '单价',
key: 'materialPrice',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '金额',
key: 'materialAmount',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '需求时间',
key: 'requiredTime',
type: FormTypes.date,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '生产日期',
key: 'productionTime',
type: FormTypes.date,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '保质期',
key: 'expirationDate',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '供货商',
key: 'supplierId',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '用途',
key: 'purpose',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '物资调拨流程主表id',
key: 'processMaterialsAllotId',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '删除标志',
key: 'delFlag',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '实发数',
key: 'allotSendNumber',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
]
},
url: {
add: "/burst/processIndustrialAllot/add",
edit: "/burst/processIndustrialAllot/edit",
processIndustrialAllotMaterial: {
list: '/burst/processIndustrialAllot/queryProcessIndustrialAllotMaterialByMainId'
},
}
}
},
props: {
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
},
/*流程数据*/
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
/*是否新增*/
isNew: { type: Boolean, default: false, required: false },
/*是否处理流程*/
task: { type: Boolean, default: false, required: false },
/*采购类型*/
isPlanType: { type: Boolean, default: false, required: false },
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
let company = sessionStorage.getItem('PARENT_ID')
let puwwcid = sessionStorage.getItem('PUWWC_Id')
let userInfo = sessionStorage.getItem('USER_INFORMATION')
if (!this.isNew) {
// this.init()
} else {
this.popupCallback(company, userInfo, puwwcid)
}
},
methods: {
//物资类型切换
async elect(val) {
console.log("val>>>>>>>>>>>",val)
if (val != undefined) {
this.accounting = val;
this.isabled = false;
this.qeihuan = val;
//查询民爆物资
await this.searchInformation();
}
},
popupCallback(company, row, puwwcid) {
let res = JSON.parse(row)
let param = {}
param.createBy = res.username
param.company = company
param.departId = res.departIds;
param.createTime = getCurrentTime()
//查询数据
// this.getSortNum(res.departIds);
// param.createTime = getCurrentTime();
this.data = param
let fieldval = pick(this.data, 'createBy', 'company', 'departId', 'createTime')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval);
})
},
addBefore(){
this.processIndustrialAllotMaterialTable.dataSource=[]
},
getAllTable() {
let values = this.tableKeys.map(key => getRefPromise(this, key))
return Promise.all(values)
},
/** 调用完edit()方法之后会自动调用此方法 */
editAfter() {
this.$nextTick(() => {
})
// 加载子表数据
if (this.model.id) {
let params = { id: this.model.id }
this.requestSubTableData(this.url.processIndustrialAllotMaterial.list, params, this.processIndustrialAllotMaterialTable)
}
},
//校验所有一对一子表表单
validateSubForm(allValues){
return new Promise((resolve,reject)=>{
Promise.all([
]).then(() => {
resolve(allValues)
}).catch(e => {
if (e.error === VALIDATE_NO_PASSED) {
// 如果有未通过表单验证的子表，就自动跳转到它所在的tab
this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
} else {
console.error(e)
}
})
})
},
/** 整理成formData */
classifyIntoFormData(allValues) {
let main = Object.assign(this.model, allValues.formValue)
return {
...main, // 展开
processIndustrialAllotMaterialList: allValues.tablesValue[0].values,
}
},
validateError(msg){
this.$message.error(msg)
},
close() {
this.visible = false
this.$emit('close')
this.$refs.form.clearValidate();
},
}
}
</script>
<style scoped>
</style>

61
src/views/burst/form/purchase/ProcessIndustrialAllotModal.vue
Unescape View File

@ -0,0 +1,61 @@
<template>
<j-modal
:title="title"
:width="1200"
:visible="visible"
:maskClosable="false"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel">
<process-industrial-allot-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
</j-modal>
</template>
<script>
import ProcessIndustrialAllotForm from './ProcessIndustrialAllotForm'
export default {
name: 'ProcessIndustrialAllotModal',
components: {
ProcessIndustrialAllotForm
},
data() {
return {
title:'',
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.handleOk();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>
<style scoped>
</style>

100
src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue
Unescape View File

@ -25,6 +25,18 @@
date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="关联采购流程" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="!!this.isNew">
<!-- <a-input v-decorator="['processUdgetPlanId']" placeholder="请输入关联预算流程" ></a-input>-->
<g-plan v-decorator="['industrialPurchaseId']" :trigger-change="true"
code="demo" field="name" orgFields="name" @mounted="getPlanList" @PlanIds="getPlanIds"
@callType="getcallType"
destFields="name" />
</a-form-item>
<a-form-item label="关联采购流程" :labelCol="labelCol" :wrapperCol="wrapperCol" v-else>
<a-input v-decorator="['serialNumber']" placeholder="请输入关联预算流程"></a-input>
</a-form-item>
</a-col>
<a-col :span="8" >
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
@ -101,6 +113,7 @@ import { getAction, getStringArry } from '@/api/manage'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
import pick from 'lodash.pick'
import GPlan from '@comp/jeecg/GPlan'
import { getCurrentTime, httpAction } from '@api/manage'
export default {
@ -109,6 +122,7 @@ import { getCurrentTime, httpAction } from '@api/manage'
components: {
JFormContainer,
JDate,
GPlan,
JUpload,
JSelectDepart,
JSelectUserByDep,
@ -239,6 +253,7 @@ import { getCurrentTime, httpAction } from '@api/manage'
},
url: {
add: "/burst/processIndustrialRestore/add",
list: "/burst/processIndustrialRestore/list",
addApply: "/burst/processIndustrialRestore/addApply",
edit: "/burst/processIndustrialRestore/edit",
queryById: "/burst/processIndustrialRestore/queryById",
@ -419,6 +434,91 @@ import { getCurrentTime, httpAction } from '@api/manage'
// }
},
getcallType(type) {
this.data.materialType = type.materialType
this.serialNumber = type.warehousingBatch
let fieldval = pick(this.data, 'materialType')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval)
})
},
getPlanIds(val) {
let ids = []
if (!!val) {
for (let i = 0; i < val.length; i++) {
ids.push(val[i].id)
}
}
this.industrialPurchaseId = ids.join(',')
},
async getPlanList(val) {
if (val.length > 0) {
if (val[0].materialType == 1) {
this.isTargetLibrary = true
} else {
this.isTargetLibrary = false
}
}
let ids = []
if (!!val) {
for (let i = 0; i < val.length; i++) {
ids.push(val[i].id)
}
}
this.industrialPurchaseId = ids.join(',')
let params = {}
params.id = JSON.stringify(ids)
// console.log(params,"*****************>>")
await this.requestSubTableDatas(this.url.list, params, this.processIndustrialStorageMaterialTable)
// getAction(this.url.list,params).then((res)=>{
// if(res.success){
// console.log('将要回填的数据',res.result)
// }
// })
let res = val[0]
let param = {}
param.planType = res.planType
param.ifDirect = res.ifDirect
param.ifInspection = res.ifInspection
this.data = param
let fieldval = pick(this.data, 'planType', 'ifDirect', 'ifInspection')
this.$nextTick(() => {
// console.log("-=-=");
this.form.setFieldsValue(fieldval)
})
},
/** 查询某个tab的数据 */
requestSubTableDatas(url, params, tab) {
// tab.loading = true;
// console.log("-=-=-=-",url,params,tab);
if (this.disabled && !this.task) {
// console.log('执行了不重新查', tab.dataSource)
} else {
getAction(url, params).then(res => {
let { result } = res
let dataSource = []
if (result) {
if (Array.isArray(result)) {
dataSource = result
} else if (Array.isArray(result.records)) {
dataSource = result.records
}
}
let par = {}
dataSource.forEach(it => {
it.materialId = it.materialNumber
})
this.dataSourceNumber = dataSource
tab.dataSource = dataSource
console.log('-==-=-tab.dataSource', tab.dataSource)
typeof success === 'function' ? success(res) : ''
}).finally(() => {
tab.loading = false
})
}
},
//通过
saveAndpassTask() {
this.handleSubmit(true)

183
src/views/burst/form/subTables/ProcessIndustrialAllotMaterialSubTable.vue
Unescape View File

@ -0,0 +1,183 @@
<template>
<a-table
rowKey="id"
size="middle"
bordered
:loading="loading"
:columns="columns"
:dataSource="dataSource"
:pagination="false"
>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<div style="font-size: 12px;font-style: italic;">
<span v-if="!text">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" alt="" style="max-width:80px;height:25px;"/>
</div>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
ghost
type="primary"
icon="download"
size="small"
@click="downloadFile(text)"
>
<span>下载</span>
</a-button>
</template>
</a-table>
</template>
<script>
import { getAction } from '@api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'ProcessIndustrialAllotMaterialSubTable',
mixins: [JeecgListMixin],
props: {
record: {
type: Object,
default: null,
}
},
data() {
return {
description: '民爆调拨详情记录表内嵌列表',
disableMixinCreated: true,
loading: false,
dataSource: [],
columns: [
{
title: '物料组id（物料清单ID）',
align: 'center',
dataIndex: 'materialGroup',
},
{
title: '物料编号',
align: 'center',
dataIndex: 'equipment',
},
{
title: 'WBS',
align: 'center',
dataIndex: 'wbs',
},
{
title: '物料名称及规格型号',
align: 'center',
dataIndex: 'materialName',
},
{
title: '单位',
align: 'center',
dataIndex: 'materialUnit',
},
{
title: '调拨数量',
align: 'center',
dataIndex: 'allotNumber',
},
{
title: '调拨目标',
align: 'center',
dataIndex: 'allotTarget',
},
{
title: '单价',
align: 'center',
dataIndex: 'materialPrice',
},
{
title: '金额',
align: 'center',
dataIndex: 'materialAmount',
},
{
title: '需求时间',
align: 'center',
dataIndex: 'requiredTime',
},
{
title: '生产日期',
align: 'center',
dataIndex: 'productionTime',
},
{
title: '保质期',
align: 'center',
dataIndex: 'expirationDate',
},
{
title: '供货商',
align: 'center',
dataIndex: 'supplierId',
},
{
title: '用途',
align: 'center',
dataIndex: 'purpose',
},
{
title: '物资调拨流程主表id',
align: 'center',
dataIndex: 'processMaterialsAllotId',
},
{
title: '删除标志',
align: 'center',
dataIndex: 'delFlag',
},
{
title: '实发数',
align: 'center',
dataIndex: 'allotSendNumber',
},
],
url: {
listByMainId: '/burst/processIndustrialAllot/queryProcessIndustrialAllotMaterialByMainId',
},
}
},
watch: {
record: {
immediate: true,
handler() {
if (this.record != null) {
this.loadData(this.record)
}
}
}
},
methods: {
loadData(record) {
this.loading = true
this.dataSource = []
getAction(this.url.listByMainId, {
id: record.id
}).then((res) => {
if (res.success) {
this.dataSource = res.result.records
}
}).finally(() => {
this.loading = false
})
},
},
}
</script>
<style scoped>
</style>

220
src/views/burst/form/subTables/ProcessIndustrialRestoreMaterialSubTable.vue
Unescape View File

@ -0,0 +1,220 @@
<template>
<a-table
rowKey="id"
size="middle"
bordered
:loading="loading"
:columns="columns"
:dataSource="dataSource"
:pagination="false"
>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<div style="font-size: 12px;font-style: italic;">
<span v-if="!text">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" alt="" style="max-width:80px;height:25px;"/>
</div>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
ghost
type="primary"
icon="download"
size="small"
@click="downloadFile(text)"
>
<span>下载</span>
</a-button>
</template>
</a-table>
</template>
<script>
import { getAction } from '@api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'ProcessIndustrialRestoreMaterialSubTable',
mixins: [JeecgListMixin],
props: {
record: {
type: Object,
default: null,
required: false
},
mainId: {
type: Array,
default: null,
required: false
}
},
data() {
return {
description: 'process_industrial_purchase_material内嵌列表',
disableMixinCreated: true,
loading: false,
dataSource: [],
columns: [
{
title: '物料组',
align: 'center',
dataIndex: 'materialGroup',
},
{
title: '物料号',
align: 'center',
dataIndex: 'coding',
},
{
title: '物料名称及规格型号',
align: 'center',
dataIndex: 'materialName',
},
{
title: '系列',
align: 'center',
dataIndex: 'materialSeries',
},
{
title: '单位',
align: 'center',
dataIndex: 'materialUnit',
},
{
title: '单价',
align: 'center',
dataIndex: 'materialPrice',
},
{
title: '数量',
align: 'center',
dataIndex: 'materialQuantity',
},
{
title: '金额',
align: 'center',
dataIndex: 'materialAmount',
},
{
title: '保质期',
align: 'center',
dataIndex: 'expirationDate',
},
{
title: '生产时间',
align: 'center',
dataIndex: 'productionTime',
},
{
title: '供应商',
align: 'center',
dataIndex: 'supplierId',
},
{
title: '核算属性',
align: 'center',
dataIndex: 'materialType',
},
],
url: {
listByMainId: '/burst/processIndustrialPurchase/queryProcessIndustrialPurchaseMaterialByMainId',
list: '/burst/processIndustrialPurchase/queryProcessIndustrialPurchaseMaterialByMainIds',
},
}
},
watch: {
record: {
immediate: true,
handler() {
if (this.record != null) {
this.loadData(this.record)
}
}
},
mainId:{
immediate: true,
handler(val) {
console.log("val>>>>>>>>>>>>>>>>>>>>>>>>>>>",val)
if(!this.mainId){
// this.clearList()
}else{
let newarr=[]
val.map(item=>{
if(item){
newarr.push(item)
}
})
let valuse = JSON.stringify(newarr)
this.queryParam['id'] = valuse
this.loadDatas(1);
}
}
}
},
methods: {
loadData(record) {
this.loading = true
this.dataSource = []
getAction(this.url.listByMainId, {
id: record.id
}).then((res) => {
if (res.success) {
this.dataSource = res.result.records
}
}).finally(() => {
this.loading = false
})
},
loadDatas(arg) {
if(!this.url.list){
this.$message.error("请设置url.list属性!")
return
}
//加载数据 若传入参数1则加载第一页的内容
if (arg === 1) {
this.ipagination.current = 1;
}
var params = this.getQueryParams();//查询条件
this.loading = true;
console.log("params>>>>>>",params)
getAction(this.url.list, params).then((res) => {
if (res.success) {
this.dataSource = res.result.records||res.result;
this.dataSource.forEach(item =>{
this.Globaler.dictOptions.forEach(it =>{
if(item.materialType === parseInt( it.value ) ){
item.materialType = it.text;
}
})
})
if(res.result.total)
{
this.ipagination.total = res.result.total;
}
}
if(res.code===510){
this.$message.warning(res.message)
}
this.loading = false;
})
},
},
}
</script>
<style scoped>
</style>

281
src/views/burst/list/purchaseList/ProcessIndustrialAllotList.vue
Unescape View File

@ -0,0 +1,281 @@
<template>
<a-card class="j-inner-table-wrapper" :bordered="false">
<!-- 查询区域 begin -->
<div class="table-page-search-wrapper">
<a-form layout="inline">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域 end -->
<!-- 操作按钮区域 begin -->
<div class="table-operator">
<a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('民爆调拨流程表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel">
<a-icon type="delete"/>
<span>删除</span>
</a-menu-item>
</a-menu>
<a-button>
<span>批量操作</span>
<a-icon type="down"/>
</a-button>
</a-dropdown>
</div>
<!-- 操作按钮区域 end -->
<!-- table区域 begin -->
<div>
<a-alert type="info" showIcon style="margin-bottom: 16px;">
<template slot="message">
<span>已选择</span>
<a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
<span>项</span>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</template>
</a-alert>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
class="j-table-force-nowrap"
:scroll="{x:true}"
:loading="loading"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:expandedRowKeys="expandedRowKeys"
:rowSelection="{selectedRowKeys, onChange: onSelectChange}"
@expand="handleExpand"
@change="handleTableChange"
>
<!-- 内嵌table区域 begin -->
<template slot="expandedRowRender" slot-scope="record">
<a-tabs tabPosition="top">
<a-tab-pane tab="民爆调拨详情记录表" key="processIndustrialAllotMaterial" forceRender>
<process-industrial-allot-material-sub-table :record="record"/>
</a-tab-pane>
</a-tabs>
</template>
<!-- 内嵌table区域 end -->
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<div style="font-size: 12px;font-style: italic;">
<span v-if="!text">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" alt="" style="max-width:80px;height:25px;"/>
</div>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
ghost
type="primary"
icon="download"
size="small"
@click="downloadFile(text)"
>
<span>下载</span>
</a-button>
</template>
<template 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-popconfirm title="确定删除吗?" @confirm="handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</template>
</a-table>
</div>
<!-- table区域 end -->
<!-- 表单区域 -->
<process-industrial-allot-modal ref="modalForm" @ok="modalFormOk"/>
</a-card>
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ProcessIndustrialAllotModal from '@/views/burst/form/purchase/ProcessIndustrialAllotModal'
import ProcessIndustrialAllotMaterialSubTable from '@/views/burst/form/subTables/ProcessIndustrialAllotMaterialSubTable'
import '@/assets/less/TableExpand.less'
export default {
name: 'ProcessIndustrialAllotList',
mixins: [JeecgListMixin],
components: {
ProcessIndustrialAllotModal,
ProcessIndustrialAllotMaterialSubTable,
},
data() {
return {
description: '民爆调拨流程表列表管理页面',
// 表头
columns: [
{
title: '#',
key: 'rowIndex',
width: 60,
align: 'center',
customRender: (t, r, index) => parseInt(index) + 1
},
{
title: '流程发起公司',
align: 'center',
dataIndex: 'company',
},
{
title: '流程发起部门',
align: 'center',
dataIndex: 'departId',
},
{
title: '物资类型',
align: 'center',
dataIndex: 'materialType',
},
{
title: '被调拨目标库(单位Id)',
align: 'center',
dataIndex: 'targetLibrary',
},
{
title: '被调拨部门',
align: 'center',
dataIndex: 'beAllotDepartment',
},
{
title: '调拨批次号',
align: 'center',
dataIndex: 'warehousingBatch',
},
{
title: '描述信息',
align: 'center',
dataIndex: 'describes',
},
{
title: '文件id',
align: 'center',
dataIndex: 'fileId',
},
{
title: '删除状态',
align: 'center',
dataIndex: 'delFlag',
},
{
title: '流程状态描述',
align: 'center',
dataIndex: 'actStatus',
},
{
title: '流程描述',
align: 'center',
dataIndex: 'opinion',
},
{
title: '流程id',
align: 'center',
dataIndex: 'processId',
},
{
title: '流程判断条件',
align: 'center',
dataIndex: 'haveAndNot',
},
{
title: '操作',
dataIndex: 'action',
align: 'center',
width:147,
scopedSlots: { customRender: 'action' },
},
],
// 字典选项
dictOptions: {},
// 展开的行test
expandedRowKeys: [],
url: {
list: '/burst/processIndustrialAllot/list',
delete: '/burst/processIndustrialAllot/delete',
deleteBatch: '/burst/processIndustrialAllot/deleteBatch',
exportXlsUrl: '/burst/processIndustrialAllot/exportXls',
importExcelUrl: '/burst/processIndustrialAllot/importExcel',
},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl() {
return window._CONFIG['domianURL'] + this.url.importExcelUrl
}
},
methods: {
initDictConfig() {
},
handleExpand(expanded, record) {
this.expandedRowKeys = []
if (expanded === true) {
this.expandedRowKeys.push(record.id)
}
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'company',text:'流程发起公司',dictCode:''})
fieldList.push({type:'string',value:'departId',text:'流程发起部门',dictCode:''})
fieldList.push({type:'int',value:'materialType',text:'物资类型',dictCode:''})
fieldList.push({type:'string',value:'targetLibrary',text:'被调拨目标库(单位Id)',dictCode:''})
fieldList.push({type:'string',value:'beAllotDepartment',text:'被调拨部门',dictCode:''})
fieldList.push({type:'string',value:'warehousingBatch',text:'调拨批次号',dictCode:''})
fieldList.push({type:'Text',value:'describes',text:'描述信息',dictCode:''})
fieldList.push({type:'string',value:'fileId',text:'文件id',dictCode:''})
fieldList.push({type:'int',value:'delFlag',text:'删除状态',dictCode:''})
fieldList.push({type:'string',value:'actStatus',text:'流程状态描述',dictCode:''})
fieldList.push({type:'Text',value:'opinion',text:'流程描述',dictCode:''})
fieldList.push({type:'string',value:'processId',text:'流程id',dictCode:''})
fieldList.push({type:'int',value:'haveAndNot',text:'流程判断条件',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
Write Preview
Loading…
Cancel
Save