Browse Source

修改流程计划采购,物资入库页面取值

dev
long 2 years ago
parent
commit
ad1d9c65c1
  1. 14
      src/components/jeecg/HPlan.vue
  2. 301
      src/components/jeecg/modal/ProcessPlan.vue
  3. 2
      src/views/activiti/form/ProcessMaterialBorrowingForm.vue
  4. 42
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  5. 2
      src/views/activiti/form/ProcessMaterialsAllotForm.vue
  6. 2
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
  7. 2
      src/views/activiti/form/ProcessMaterialsReturnForm.vue
  8. 2
      src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
  9. 2
      src/views/activiti/form/ProcessSmaterialsScrapForm.vue
  10. 2
      src/views/activiti/form/ProcessSpecialMaterialsForm.vue
  11. 7
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  12. 41
      src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
  13. 4
      src/views/processmaterials/modules/ProcessMaterialBorrowingForm.vue
  14. 12
      src/views/processmaterials/modules/ProcessMaterialBorrowingModal.vue
  15. 4
      src/views/processmaterials/modules/ProcessMaterialWarehousingForm.vue
  16. 12
      src/views/processmaterials/modules/ProcessMaterialWarehousingModal.vue
  17. 4
      src/views/processmaterials/modules/ProcessMaterialsAllotForm.vue
  18. 12
      src/views/processmaterials/modules/ProcessMaterialsAllotModal.vue
  19. 4
      src/views/processmaterials/modules/ProcessMaterialsDeliveryForm.vue
  20. 12
      src/views/processmaterials/modules/ProcessMaterialsDeliveryModal.vue
  21. 4
      src/views/processmaterials/modules/ProcessMaterialsReturnForm.vue
  22. 12
      src/views/processmaterials/modules/ProcessMaterialsReturnModal.vue
  23. 6
      src/views/processmaterials/modules/ProcessPermissionAuthorizationForm.vue
  24. 2
      src/views/processmaterials/modules/ProcessSmaterialsScrapForm.vue
  25. 2
      src/views/processmaterials/modules/ProcessSmaterialsScrapModal.vue
  26. 4
      src/views/processmaterials/modules/ProcessSpecialMaterialsForm.vue
  27. 12
      src/views/processmaterials/modules/ProcessSpecialMaterialsModal.vue
  28. 2
      src/views/processmaterials/modules/ProcessUdgetPlanForm.vue

14
src/components/jeecg/HPlan.vue

@ -128,9 +128,17 @@
},
methods: {
openModal() {
if (this.disabled === false) {
this.$refs.ProcessPlan.show();
if (this.showText){
this.$refs.ProcessPlan.show(this.showText);
}else {
if (this.disabled === false) {
this.$refs.ProcessPlan.show();
}
}
},
getID(){
this.showText
},
handleEmpty() {
this.showText = ''
@ -188,10 +196,12 @@
if (this.triggerChange) {
//v-dectriggerChangetrue form setFieldsValue
this.$emit('callback', rows[0].id)
this.$emit('mounted', rows[0].id)
} else {
//v-model field
// this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]])
this.$emit('input', this.showText, rows[0])
this.$emit('mounted', rows[0].id)
console.log(rows[0].id)
}
}

301
src/components/jeecg/modal/ProcessPlan.vue

@ -54,7 +54,8 @@
<!-- 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>
<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>
@ -78,7 +79,8 @@
</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;"/>
<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>
@ -108,9 +110,9 @@
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
<a-menu slot="overlay">
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@ -125,8 +127,8 @@
</div>
<a-tabs defaultActiveKey="1">
<a-tab-pane tab="预算计划采购流程物料清单表" key="1" >
<ProcessUdgetPlanMaterialList :mainId="selectedMainId" />
<a-tab-pane tab="预算计划采购流程物料清单表" key="1">
<ProcessUdgetPlanMaterialList :mainId="selectedMainId"/>
</a-tab-pane>
</a-tabs>
</a-card>
@ -137,212 +139,205 @@
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@/api/manage'
import {filterObj} from '@/utils/util'
import { filterObj } from '@/utils/util'
import ProcessUdgetPlanMaterialList from '../../../views/processmaterials/ProcessUdgetPlanMaterialList'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
import '@/assets/less/TableExpand.less'
const MODAL_WIDTH = 1200;
const MODAL_WIDTH = 1200
export default {
name: 'ProcessPlan',
props: ['multi', 'code', 'groupId', 'param'],
components:{
components: {
ProcessUdgetPlanMaterialList,
JSuperQuery,
JDictSelectTag
},
mixins:[JeecgListMixin],
data(){
mixins: [JeecgListMixin],
data() {
return {
visible:false,
confirmLoading:false,
title:'预算计划采购流程管理列表',
visible: false,
confirmLoading: false,
title: '预算计划采购流程管理列表',
description: '预算计划采购流程管理页面',
queryParam:{
},
queryParam: {},
//
columns: [
{
title:'流程发起公司',
align:"center",
dataIndex: 'company_dictText',
title: '流程发起公司',
align: 'center',
dataIndex: 'company_dictText'
},
{
title:'流程发起时间',
align:"center",
title: '流程发起时间',
align: 'center',
dataIndex: 'createTime'
},
{
title:'流程发起部门',
align:"center",
dataIndex: 'sysOrgCode_dictText',
title: '流程发起部门',
align: 'center',
dataIndex: 'sysOrgCode_dictText'
},
{
title:'流程发起人',
align:"center",
title: '流程发起人',
align: 'center',
dataIndex: 'createBy'
},
{
title:'物资类型',
align:"center",
dataIndex: 'materialType_dictText',
title: '物资类型',
align: 'center',
dataIndex: 'materialType_dictText'
},
{
title:'流程计划',
align:"center",
dataIndex: 'processPlan_dictText',
title: '流程计划',
align: 'center',
dataIndex: 'processPlan_dictText'
},
{
title:'需求时间',
align:"center",
title: '需求时间',
align: 'center',
dataIndex: 'needTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
customRender: function(text) {
return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
}
},
{
title:'顺序号',
align:"center",
title: '顺序号',
align: 'center',
dataIndex: 'orderNumber'
},
{
title:'文件id',
align:"center",
title: '文件id',
align: 'center',
dataIndex: 'fileId',
scopedSlots: {customRender: 'fileSlot'}
scopedSlots: { customRender: 'fileSlot' }
}
],
url: {
list: "/hy/processUdgetPlan/list",
delete: "/hy/processUdgetPlan/delete",
deleteBatch: "/hy/processUdgetPlan/deleteBatch",
exportXlsUrl: "/hy/processUdgetPlan/exportXls",
importExcelUrl: "hy/processUdgetPlan/importExcel",
list: '/hy/processUdgetPlan/list',
delete: '/hy/processUdgetPlan/delete',
deleteBatch: '/hy/processUdgetPlan/deleteBatch',
exportXlsUrl: '/hy/processUdgetPlan/exportXls',
importExcelUrl: 'hy/processUdgetPlan/importExcel'
},
dictOptions:{
company:[],
sysOrgCode:[],
materialType:[],
processPlan:[],
dictOptions: {
company: [],
sysOrgCode: [],
materialType: [],
processPlan: []
},
/* 分页参数 */
pagination:{
pagination: {
current: 1,
pageSize: 5,
pageSizeOptions: ['5', '10', '50'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 共" + total + "条"
return range[0] + '-' + range[1] + ' 共' + total + '条'
},
showQuickJumper: true,
showSizeChanger: true,
total: 0
},
selectedMainId:'',
superFieldList:[],
selectedRowKeys:[],
modalWidth:MODAL_WIDTH,
selectedMainId: '',
superFieldList: [],
selectedRowKeys: [],
modalWidth: MODAL_WIDTH,
changeData: ''
}
},
mounted() {
//this.loadColumnsInfo()
},
/*watch: {
code() {
this.loadData();
},
param:{
deep:true,
handler(){
alert(1)
this.loadData();
},
}
},*/
computed:{
showSearchFlag(){
return this.queryInfo && this.queryInfo.length>0
watch: {},
computed: {
showSearchFlag() {
return this.queryInfo && this.queryInfo.length > 0
}
},
methods:{
methods: {
onClearSelected() {
this.selectedRowKeys = [];
this.selectionRows = [];
this.selectedMainId=''
this.selectedRowKeys = []
this.selectionRows = []
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
this.selectedMainId=selectedRowKeys[0]
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
console.log(selectedRowKeys)
console.log(selectionRows)
this.selectedMainId = selectedRowKeys[0]
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
},
loadPlan(arg) {
if(!this.url.list){
this.$message.error("请设置url.list属性!")
if (!this.url.list) {
this.$message.error('请设置url.list属性!')
return
}
// 1
if (arg === 1) {
this.pagination.current = 1;
this.pagination.current = 1
}
this.onClearSelected()
var params = this.queryParams();//
this.loading = true;
var params = this.queryParams()//
this.loading = true
getAction(this.url.list, params).then((res) => {
if (res.success) {
this.dataSource = res.result.records;
this.pagination.total = res.result.total;
this.dataSource = res.result.records
this.pagination.total = res.result.total
}
if(res.code===510){
if (res.code === 510) {
this.$message.warning(res.message)
}
this.loading = false;
this.loading = false
})
this.selectedRowKeys =this.changeData
this.selectedMainId =this.changeData[0];
},
clickThenSelect(record) {
return {
on: {
click: () => {
this.onSelectChange(record.id.split(","), [record]);
this.onSelectChange(record.id.split(','), [record])
}
}
}
},
queryParams() {
let paramTarget = {}
if(this.dynamicParam){
if (this.dynamicParam) {
//
Object.keys(this.dynamicParam).map(key=>{
paramTarget['self_'+key] = this.dynamicParam[key]
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);
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:issueonline LOWCOD-844
if(!selectedRowKeys || selectedRowKeys.length==0){
if (!selectedRowKeys || selectedRowKeys.length == 0) {
this.table.selectionRows = []
}else if(selectedRowKeys.length == selectionRows.length){
} else if (selectedRowKeys.length == selectionRows.length) {
this.table.selectionRows = selectionRows
}else{
} else {
//
let keys = this.table.selectedRowKeys
let rows = this.table.selectionRows;
let rows = this.table.selectionRows
//
for(let i=0;i<selectionRows.length;i++){
for (let i = 0; i < selectionRows.length; i++) {
let combineKey = this.combineRowKey(selectionRows[i])
if(keys.indexOf(combineKey)<0){
if (keys.indexOf(combineKey) < 0) {
// key push
rows.push(selectionRows[i])
}
}
//
this.table.selectionRows = rows.filter(item=>{
this.table.selectionRows = rows.filter(item => {
let combineKey = this.combineRowKey(item)
return selectedRowKeys.indexOf(combineKey)>=0
return selectedRowKeys.indexOf(combineKey) >= 0
})
}
//update-end-author:taoyan date:2020902 for:issueonline LOWCOD-844
@ -361,79 +356,84 @@
this.close()
},
handleSubmit() {
if(!this.multi){
if(this.selectionRows && this.selectionRows.length>1){
this.$message.warning("请选择一条记录")
if (!this.multi) {
if (this.selectionRows && this.selectionRows.length > 1) {
this.$message.warning('请选择一条记录')
return false
}
}
if(!this.selectionRows || this.selectionRows.length==0){
this.$message.warning("请选择一条记录")
if (!this.selectionRows || this.selectionRows.length == 0) {
this.$message.warning('请选择一条记录')
return false
}
console.log(this.selectionRows)
this.$emit('ok', this.selectionRows);
this.$emit('ok', this.selectionRows)
this.close()
},
close() {
this.$emit('close');
this.visible = false;
this.$emit('close')
this.visible = false
//this.onClearSelected()
},
show(){
show(val) {
let data=[]
data.push(val)
console.log('这是什么数据',data)
this.changeData=data;
// this.selectionRows= val
this.visible = true
this.loadPlan(1);
this.loadPlan(1)
},
handleToggleSearch(){
this.toggleSearchStatus = !this.toggleSearchStatus;
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
searchByquery(){
searchByquery() {
//this.loadData(1);
},
onlyReload(){
onlyReload() {
//this.loadData();
},
searchReset(){
Object.keys(this.queryParam).forEach(key=>{
this.queryParam[key]=""
searchReset() {
Object.keys(this.queryParam).forEach(key => {
this.queryParam[key] = ''
})
//this.loadData(1);
},
/* onClearSelected(){
this.table.selectedRowKeys = []
this.table.selectionRows = []
},*/
combineRowKey(record){
/* onClearSelected(){
this.table.selectedRowKeys = []
this.table.selectionRows = []
},*/
combineRowKey(record) {
let res = ''
Object.keys(record).forEach(key=>{
res+=record[key]
Object.keys(record).forEach(key => {
res += record[key]
})
if(res.length>50){
res = res.substring(0,50)
if (res.length > 50) {
res = res.substring(0, 50)
}
return res
},
clickThenCheck(record){
clickThenCheck(record) {
return {
on: {
click: () => {
let rowKey = this.combineRowKey(record)
if(!this.table.selectedRowKeys || this.table.selectedRowKeys.length==0){
let arr1=[],arr2=[]
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 = arr2
this.table.selectionRows = arr1
} else {
if (this.table.selectedRowKeys.indexOf(rowKey) < 0) {
this.table.selectedRowKeys.push(rowKey)
this.table.selectionRows.push(record)
}else{
} else {
let rowKey_index = this.table.selectedRowKeys.indexOf(rowKey)
this.table.selectedRowKeys.splice(rowKey_index,1);
this.table.selectionRows.splice(rowKey_index,1);
this.table.selectedRowKeys.splice(rowKey_index, 1)
this.table.selectionRows.splice(rowKey_index, 1)
}
}
}
@ -441,15 +441,14 @@
}
},
//
initDictOptionData(dictOptions){
alert(1)
let obj = { }
Object.keys(dictOptions).map(k=>{
obj[k] = dictOptions[k].filter(item=>{
return item!=null
});
});
this.dictOptions = obj
initDictOptionData(dictOptions) {
let obj = {}
Object.keys(dictOptions).map(k => {
obj[k] = dictOptions[k].filter(item => {
return item != null
})
})
this.dictOptions = obj
}
}

2
src/views/activiti/form/ProcessMaterialBorrowingForm.vue

@ -40,7 +40,7 @@
</a-form-item>
</a-col>
<a-col :span="8" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>

42
src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@ -27,7 +27,7 @@
<a-col :span="8" >
<a-form-item label="关联预算流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-input v-decorator="['processUdgetPlanId']" placeholder="请输入关联预算流程" ></a-input>-->
<h-plan v-model="processUdgetPlanId" code="demo" field="name" orgFields="name" destFields="name" :multi="true"/>
<h-plan v-decorator="['processUdgetPlanId']" :trigger-change="true" code="demo" field="name" orgFields="name" @mounted="getPlanList" destFields="name" :multi="true"/>
<!-- <j-popup-->
<!-- v-decorator="['one']"-->
<!-- :trigger-change="true"-->
@ -54,7 +54,7 @@
</a-form-item>
</a-col>
<a-col :span="8" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -134,6 +134,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
},
//
addDefaultRowNum: 1,
selectedMainId:'',
processUdgetPlanId:'',
validatorRules: {
},
@ -154,15 +155,15 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
// placeholder: '${title}',
// defaultValue:'',
// },
// {
// title: '',
// key: 'materialNumber',
// type: FormTypes.sel_search,
// dictCode:"",
// width:"200px",
// placeholder: '${title}',
// defaultValue:'',
// },
{
title: '物料号',
key: 'materialNumber',
type: FormTypes.sel_search,
dictCode:"",
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
// {
// title: '',
// key: 'materialDescription',
@ -231,7 +232,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
// placeholder: '${title}',
// defaultValue:'',
// },
{
/* {
title: '器材编号',
key: 'equipment',
type: FormTypes.sel_search,
@ -239,11 +240,11 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
},*/
{
title: 'WBS',
key: 'wbs',
type: FormTypes.sel_search,
type: FormTypes.input,
dictCode:"",
width:"200px",
placeholder: '请输入${title}',
@ -322,6 +323,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
add: "/hy/processMaterialWarehousing/add",
edit: "/hy/processMaterialWarehousing/edit",
queryById: "/hy/processMaterialWarehousing/queryById",
list: "/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId",
processMaterialWarehousingList: {
list: '/hy/processMaterialWarehousing/queryProcessMaterialWarehousingListByMainId'
},
@ -432,6 +434,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
throw this.throwNotFunction('classifyIntoFormData')
}
let formData = this.classifyIntoFormData(allValues)
formData.processUdgetPlanId=this.processUdgetPlanId
if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){
this.$message.error("物资类型不能为空")
return;
@ -448,7 +451,6 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
this.$message.error("入库总批次不能为空")
return;
}
formData.processUdgetPlanId=this.processUdgetPlanId
console.log('格式化后的数据',formData)
this.form.validateFields((err, values) => {
if (!err) {
@ -523,6 +525,16 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
validateError(msg){
this.$message.error(msg)
},
getPlanList(id){
let params={}
params.id=id;
this.requestSubTableData(this.url.list, params, this.processMaterialWarehousingListTable)
// getAction(this.url.list,params).then((res)=>{
// if(res.success){
// console.log('',res.result)
// }
// })
},
popupCallback(company,row) {
let res=JSON.parse(row);
console.log('获取我的数据',res.id)

2
src/views/activiti/form/ProcessMaterialsAllotForm.vue

@ -41,7 +41,7 @@
</a-col>
<a-col :span="8
" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>

2
src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@ -40,7 +40,7 @@
</a-form-item>
</a-col>
<a-col :span="8" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>

2
src/views/activiti/form/ProcessMaterialsReturnForm.vue

@ -40,7 +40,7 @@
</a-form-item>
</a-col>
<a-col :span="8" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>

2
src/views/activiti/form/ProcessPermissionAuthorizationForm.vue

@ -59,7 +59,7 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['fileId']" placeholder="请输入文件id" ></a-input>
</a-form-item>
</a-col>

2
src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@ -40,7 +40,7 @@
</a-form-item>
</a-col>
<a-col :span="8" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>

2
src/views/activiti/form/ProcessSpecialMaterialsForm.vue

@ -40,7 +40,7 @@
</a-form-item>
</a-col>
<a-col :span="8" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>

7
src/views/activiti/form/ProcessUdgetPlanForm.vue

@ -44,8 +44,8 @@
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="需求时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择需求时间" v-decorator="['needTime']" :trigger-change="true" style="width: 100%"/>
<a-form-item label="需求时间" :labelCol="labelCol" :wrapperCol="wrapperCol" >
<j-date placeholder="请选择需求时间" v-decorator="['needTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
</a-form-item>
</a-col>
<a-col :span="8">
@ -450,7 +450,8 @@
'materialSeries': record.row.materialSeries,
'materialName': record.row.materialName,
'materialUnit': record.row.materialUnit,
'materialAmount': record.row.materialQuantity * record.row.materialPrice
'materialAmount': record.row.materialQuantity * record.row.materialPrice,
'materialType': this.data.materialType
},
},
]

41
src/views/processmaterials/ProcessUdgetPlanMaterialList.vue

@ -1,7 +1,7 @@
<template>
<a-card :bordered="false" :class="'cust-erp-sub-tab'">
<!-- 操作按钮区域 -->
<div class="table-operator" v-if="mainId">
<!--<div class="table-operator" v-if="mainId">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('预算计划采购流程物料清单表')">导出</a-button>
<a-upload
@ -13,7 +13,7 @@
@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>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
@ -21,7 +21,7 @@
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
</div>-->
<!-- table区域-begin -->
<div>
@ -83,12 +83,13 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ProcessUdgetPlanMaterialModal from './modules/ProcessUdgetPlanMaterialModal'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
import '@/assets/less/TableExpand.less'
export default {
name: "ProcessUdgetPlanMaterialList",
mixins:[JeecgListMixin],
components: { ProcessUdgetPlanMaterialModal,JSuperQuery },
components: { JDictSelectTag,ProcessUdgetPlanMaterialModal,JSuperQuery,
},
props:{
mainId:{
type:String,
@ -116,7 +117,7 @@
//
columns: [
{
title: '#',
title: '序号',
dataIndex: '',
key:'rowIndex',
width:60,
@ -128,20 +129,20 @@
{
title:'物料组',
align:"center",
dataIndex: 'materialGroup_dictText',
dataIndex: 'materialGroup',
},
{
title:'物料号',
align:"center",
dataIndex: 'materialNumber_dictText',
dataIndex: 'materialNumber',
},
{
/* {
title:'物料描述',
align:"center",
dataIndex: 'materialDescription'
},
{
title:'仓储地点_id',
title:'仓储地点',
align:"center",
dataIndex: 'unitWasteWarehouseCodeId'
},
@ -178,26 +179,26 @@
title:'入库人',
align:"center",
dataIndex: 'librarySign'
},
},*/
{
title:'核算属性',
align:"center",
dataIndex: 'materialType'
dataIndex: 'materialType_dictText'
},
{
title:'物料名称及规格型号',
align:"center",
dataIndex: 'materialName_dictText',
dataIndex: 'materialName',
},
{
title:'系列',
align:"center",
dataIndex: 'materialSeries_dictText',
dataIndex: 'materialSeries',
},
{
title:'单位',
align:"center",
dataIndex: 'materialUnit_dictText',
dataIndex: 'materialUnit',
},
{
title:'单价',
@ -227,9 +228,10 @@
{
title:'备注',
align:"center",
dataIndex: 'remarks'
dataIndex: 'remarks',
fixed:"right",
},
{
/* {
title:'删除标志',
align:"center",
dataIndex: 'delFlag'
@ -243,6 +245,7 @@
title:'修改人',
align:"center",
dataIndex: 'updateBy'
dataIndex: 'action',
},
{
title: '操作',
@ -251,7 +254,7 @@
fixed:"right",
width:100,
scopedSlots: { customRender: 'action' },
}
}*/
],
url: {
list: "/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId",

4
src/views/processmaterials/modules/ProcessMaterialBorrowingForm.vue

@ -35,7 +35,7 @@
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -68,7 +68,7 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'

12
src/views/processmaterials/modules/ProcessMaterialBorrowingModal.vue

@ -42,7 +42,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -57,7 +57,7 @@
import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
@ -65,7 +65,7 @@
export default {
name: "ProcessMaterialBorrowingModal",
components: {
components: {
JDate,
JUpload,
JSelectDepart,
@ -95,7 +95,7 @@
add: "/hy/processMaterialBorrowing/add",
edit: "/hy/processMaterialBorrowing/edit",
}
}
},
created () {
@ -145,7 +145,7 @@
that.close();
})
}
})
},
handleCancel () {
@ -155,7 +155,7 @@
this.form.setFieldsValue(pick(row,'updateFirm','createTime','sysOrgCode','createBy','materialType','borrowedDepartments','fileId'))
},
}
}
</script>

4
src/views/processmaterials/modules/ProcessMaterialWarehousingForm.vue

@ -45,7 +45,7 @@
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -78,7 +78,7 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'

12
src/views/processmaterials/modules/ProcessMaterialWarehousingModal.vue

@ -52,7 +52,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -67,14 +67,14 @@
import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
export default {
name: "ProcessMaterialWarehousingModal",
components: {
components: {
JDate,
JUpload,
JSelectDepart,
@ -103,7 +103,7 @@
add: "/hy/processMaterialWarehousing/add",
edit: "/hy/processMaterialWarehousing/edit",
}
}
},
created () {
@ -153,7 +153,7 @@
that.close();
})
}
})
},
handleCancel () {
@ -163,7 +163,7 @@
this.form.setFieldsValue(pick(row,'company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId'))
},
}
}
</script>

4
src/views/processmaterials/modules/ProcessMaterialsAllotForm.vue

@ -35,7 +35,7 @@
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -68,7 +68,7 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'

12
src/views/processmaterials/modules/ProcessMaterialsAllotModal.vue

@ -42,7 +42,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -57,7 +57,7 @@
import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
@ -65,7 +65,7 @@
export default {
name: "ProcessMaterialsAllotModal",
components: {
components: {
JDate,
JUpload,
JSelectDepart,
@ -95,7 +95,7 @@
add: "/hy/processMaterialsAllot/add",
edit: "/hy/processMaterialsAllot/edit",
}
}
},
created () {
@ -145,7 +145,7 @@
that.close();
})
}
})
},
handleCancel () {
@ -155,7 +155,7 @@
this.form.setFieldsValue(pick(row,'company','createTime','sysOrgCode','createBy','materialType','beAllotDepartment','fileId'))
},
}
}
</script>

4
src/views/processmaterials/modules/ProcessMaterialsDeliveryForm.vue

@ -35,7 +35,7 @@
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -68,7 +68,7 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'

12
src/views/processmaterials/modules/ProcessMaterialsDeliveryModal.vue

@ -42,7 +42,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -57,7 +57,7 @@
import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
@ -65,7 +65,7 @@
export default {
name: "ProcessMaterialsDeliveryModal",
components: {
components: {
JDate,
JUpload,
JSelectDepart,
@ -95,7 +95,7 @@
add: "/hy/processMaterialsDelivery/add",
edit: "/hy/processMaterialsDelivery/edit",
}
}
},
created () {
@ -145,7 +145,7 @@
that.close();
})
}
})
},
handleCancel () {
@ -155,7 +155,7 @@
this.form.setFieldsValue(pick(row,'company','createTime','sysOrgCode','createBy','materialType','deliveryTime','fileId'))
},
}
}
</script>

4
src/views/processmaterials/modules/ProcessMaterialsReturnForm.vue

@ -35,7 +35,7 @@
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -68,7 +68,7 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'

12
src/views/processmaterials/modules/ProcessMaterialsReturnModal.vue

@ -42,7 +42,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -57,7 +57,7 @@
import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
@ -65,7 +65,7 @@
export default {
name: "ProcessMaterialsReturnModal",
components: {
components: {
JDate,
JUpload,
JSelectDepart,
@ -95,7 +95,7 @@
add: "/hy/processMaterialsReturn/add",
edit: "/hy/processMaterialsReturn/edit",
}
}
},
created () {
@ -145,7 +145,7 @@
that.close();
})
}
})
},
handleCancel () {
@ -155,7 +155,7 @@
this.form.setFieldsValue(pick(row,'company','createTime','sysOrgCode','createBy','materialType','processBorrowId','fileId'))
},
}
}
</script>

6
src/views/processmaterials/modules/ProcessPermissionAuthorizationForm.vue

@ -59,7 +59,7 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['fileId']" placeholder="请输入文件id" ></a-input>
</a-form-item>
</a-col>
@ -78,7 +78,7 @@
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JDictSelectTag from "@/components/dict/JDictSelectTag"
import JSwitch from '@/components/jeecg/JSwitch'
@ -206,7 +206,7 @@
that.confirmLoading = false;
})
}
})
},
popupCallback(row){

2
src/views/processmaterials/modules/ProcessSmaterialsScrapForm.vue

@ -35,7 +35,7 @@
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>

2
src/views/processmaterials/modules/ProcessSmaterialsScrapModal.vue

@ -42,7 +42,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>

4
src/views/processmaterials/modules/ProcessSpecialMaterialsForm.vue

@ -35,7 +35,7 @@
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -68,7 +68,7 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'

12
src/views/processmaterials/modules/ProcessSpecialMaterialsModal.vue

@ -42,7 +42,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>
@ -57,7 +57,7 @@
import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JDate from '@/components/jeecg/JDate'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
@ -66,7 +66,7 @@
export default {
name: "ProcessSpecialMaterialsModal",
components: {
components: {
JDate,
JUpload,
JSelectDepart,
@ -97,7 +97,7 @@
add: "/hy/processSpecialMaterials/add",
edit: "/hy/processSpecialMaterials/edit",
}
}
},
created () {
@ -147,7 +147,7 @@
that.close();
})
}
})
},
handleCancel () {
@ -157,7 +157,7 @@
this.form.setFieldsValue(pick(row,'company','createTime','sysOrgCode','createBy','materialType','processReturnId','fileId'))
},
}
}
</script>

2
src/views/processmaterials/modules/ProcessUdgetPlanForm.vue

@ -45,7 +45,7 @@
</a-form-item>
</a-col>
<a-col :span="12" >
<a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true" ></j-upload>
</a-form-item>
</a-col>

Loading…
Cancel
Save