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

修改流程数据回显存在的bug

dev
long 2 years ago
parent
201d43e916
commit
7a4dc7a32a
11 changed files with 219 additions and 181 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/components/jeecg/HDelivery.vue
  2. 1
      src/components/jeecg/HPlan.vue
  3. 287
      src/components/jeecg/modal/ProcessDelivery.vue
  4. 34
      src/components/jeecg/modal/ProcessPlan.vue
  5. 10
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  6. 5
      src/views/activiti/form/ProcessMaterialsAllotForm.vue
  7. 5
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
  8. 8
      src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
  9. 7
      src/views/activiti/form/ProcessSmaterialsScrapForm.vue
  10. 3
      src/views/activiti/form/ProcessSpecialMaterialsForm.vue
  11. 29
      src/views/processmaterials/ProcessMaterialsDeliveryListList.vue

11
src/components/jeecg/HDelivery.vue
Unescape View File

@ -128,8 +128,13 @@
}, },
methods: { methods: {
openModal() { openModal() {
if (this.disabled === false) {
this.$refs.ProcessDelivery.show(); if (this.showText){
this.$refs.ProcessDelivery.show(this.showText);
}else {
if (this.disabled === false) {
this.$refs.ProcessDelivery.show();
}
} }
}, },
handleEmpty() { handleEmpty() {
@ -195,7 +200,7 @@
} else { } else {
//v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值 //v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值
// this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]]) // this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]])
this.$emit('input', this.showText, rows[0].id) this.$emit('input', this.showText, rows[0])
this.$emit('mounted', rows[0].id) this.$emit('mounted', rows[0].id)
this.$emit('callType', rows[0]) this.$emit('callType', rows[0])
} }

1
src/components/jeecg/HPlan.vue
Unescape View File

@ -96,7 +96,6 @@
computed: { computed: {
uniqGroupId() { uniqGroupId() {
if (this.groupId) { if (this.groupId) {
console.log('*-*-*-*-*->',this.groupId)
let { groupId, code, field, orgFields, destFields } = this let { groupId, code, field, orgFields, destFields } = this
return `${groupId}_${code}_${field}_${orgFields}_${destFields}` return `${groupId}_${code}_${field}_${orgFields}_${destFields}`
} }

287
src/components/jeecg/modal/ProcessDelivery.vue
Unescape View File

@ -49,7 +49,8 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <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> <a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div> </div>
@ -73,7 +74,8 @@
</template> </template>
<template slot="imgSlot" slot-scope="text"> <template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> <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>
<template slot="fileSlot" slot-scope="text"> <template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@ -103,9 +105,9 @@
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical"/>
<a-dropdown> <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 slot="overlay">
<a-menu-item> <a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@ -120,8 +122,8 @@
</div> </div>
<a-tabs defaultActiveKey="1"> <a-tabs defaultActiveKey="1">
<a-tab-pane tab="物资出库流程出库清单" key="1" > <a-tab-pane tab="物资出库流程出库清单" key="1">
<ProcessMaterialsDeliveryListList :mainId="selectedMainId" /> <ProcessMaterialsDeliveryListList :mainId="selectedMainId"/>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-card> </a-card>
@ -132,100 +134,101 @@
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import {filterObj} from '@/utils/util' import { filterObj } from '@/utils/util'
import ProcessMaterialsDeliveryListList from '../../../views/processmaterials/ProcessMaterialsDeliveryListList' import ProcessMaterialsDeliveryListList from '../../../views/processmaterials/ProcessMaterialsDeliveryListList'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue' import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
import '@/assets/less/TableExpand.less' import '@/assets/less/TableExpand.less'
const MODAL_WIDTH = 1200;
const MODAL_WIDTH = 1200
export default { export default {
name: 'ProcessDelivery', name: 'ProcessDelivery',
props: ['multi', 'code', 'groupId', 'param'], props: ['multi', 'code', 'groupId', 'param'],
components:{ components: {
ProcessMaterialsDeliveryListList, ProcessMaterialsDeliveryListList,
JSuperQuery, JSuperQuery,
JDictSelectTag JDictSelectTag
}, },
mixins:[JeecgListMixin], mixins: [JeecgListMixin],
data(){ data() {
return { return {
visible:false, visible: false,
confirmLoading:false, confirmLoading: false,
title:'物资出库流程管理列表', title: '物资出库流程管理列表',
description: '物资出库流程管理页面', description: '物资出库流程管理页面',
queryParam:{ queryParam: {},
},
columns: [ columns: [
{ {
title:'流程发起公司', title: '流程发起公司',
align:"center", align: 'center',
dataIndex: 'company_dictText', dataIndex: 'company_dictText'
}, },
{ {
title:'流程发起时间', title: '流程发起时间',
align:"center", align: 'center',
dataIndex: 'createTime' dataIndex: 'createTime'
}, },
{ {
title:'流程发起部门', title: '流程发起部门',
align:"center", align: 'center',
dataIndex: 'sysOrgCode_dictText', dataIndex: 'sysOrgCode_dictText'
}, },
{ {
title:'流程发起人', title: '流程发起人',
align:"center", align: 'center',
dataIndex: 'createBy' dataIndex: 'createBy'
}, },
{ {
title:'物资类型', title: '物资类型',
align:"center", align: 'center',
dataIndex: 'materialType_dictText', dataIndex: 'materialType_dictText'
}, },
{ {
title:'出库时间', title: '出库时间',
align:"center", align: 'center',
dataIndex: 'deliveryTime', dataIndex: 'deliveryTime',
customRender:function (text) { customRender: function(text) {
return !text?"":(text.length>10?text.substr(0,10):text) return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
} }
},
{
title:'文件id',
align:"center",
dataIndex: 'fileId',
scopedSlots: {customRender: 'fileSlot'}
} }
// {
// title:'文件id',
// align:"center",
// dataIndex: 'fileId',
// scopedSlots: {customRender: 'fileSlot'}
// }
], ],
url: { url: {
list: "/hy/processMaterialsDelivery/list", list: '/hy/processMaterialsDelivery/list',
delete: "/hy/processMaterialsDelivery/delete", delete: '/hy/processMaterialsDelivery/delete',
deleteBatch: "/hy/processMaterialsDelivery/deleteBatch", deleteBatch: '/hy/processMaterialsDelivery/deleteBatch',
exportXlsUrl: "/hy/processMaterialsDelivery/exportXls", exportXlsUrl: '/hy/processMaterialsDelivery/exportXls',
importExcelUrl: "hy/processMaterialsDelivery/importExcel", importExcelUrl: 'hy/processMaterialsDelivery/importExcel'
}, },
dictOptions:{ dictOptions: {
company:[], company: [],
sysOrgCode:[], sysOrgCode: [],
materialType:[], materialType: [],
processPlan:[], processPlan: []
}, },
/* 分页参数 */ /* 分页参数 */
pagination:{ pagination: {
current: 1, current: 1,
pageSize: 5, pageSize: 5,
pageSizeOptions: ['5', '10', '50'], pageSizeOptions: ['5', '10', '50'],
showTotal: (total, range) => { showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 共" + total + "条" return range[0] + '-' + range[1] + ' 共' + total + '条'
}, },
showQuickJumper: true, showQuickJumper: true,
showSizeChanger: true, showSizeChanger: true,
total: 0 total: 0
}, },
selectedMainId:'', selectedMainId: '',
superFieldList:[], superFieldList: [],
selectedRowKeys:[], selectedRowKeys: [],
modalWidth:MODAL_WIDTH, modalWidth: MODAL_WIDTH,
changeData: '',
getFileData: false
} }
}, },
mounted() { mounted() {
@ -244,89 +247,91 @@
}, },
} }
},*/ },*/
computed:{ computed: {
showSearchFlag(){ showSearchFlag() {
return this.queryInfo && this.queryInfo.length>0 return this.queryInfo && this.queryInfo.length > 0
} }
}, },
methods:{ methods: {
onClearSelected() { onClearSelected() {
this.selectedRowKeys = []; this.selectedRowKeys = []
this.selectionRows = []; this.selectionRows = []
this.selectedMainId='' this.selectedMainId = ''
}, },
onSelectChange(selectedRowKeys, selectionRows) { onSelectChange(selectedRowKeys, selectionRows) {
this.selectedMainId=selectedRowKeys[0] this.selectedMainId = selectedRowKeys[0]
this.selectedRowKeys = selectedRowKeys; this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows; this.selectionRows = selectionRows
}, },
loadPlan(arg) { loadPlan(arg) {
if(!this.url.list){ if (!this.url.list) {
this.$message.error("请设置url.list属性!") this.$message.error('请设置url.list属性!')
return return
} }
//加载数据 若传入参数1则加载第一页的内容 //加载数据 若传入参数1则加载第一页的内容
if (arg === 1) { if (arg === 1) {
this.pagination.current = 1; this.pagination.current = 1
} }
this.onClearSelected() this.onClearSelected()
var params = this.queryParams();//查询条件 var params = this.queryParams()//查询条件
this.loading = true; this.loading = true
getAction(this.url.list, params).then((res) => { getAction(this.url.list, params).then((res) => {
if (res.success) { if (res.success) {
this.dataSource = res.result.records; this.dataSource = res.result.records
this.pagination.total = res.result.total; this.pagination.total = res.result.total
} }
if(res.code===510){ if (res.code === 510) {
this.$message.warning(res.message) this.$message.warning(res.message)
} }
this.loading = false; this.loading = false
}) })
this.selectedRowKeys = this.changeData
this.selectedMainId = this.changeData[0]
}, },
clickThenSelect(record) { clickThenSelect(record) {
return { return {
on: { on: {
click: () => { click: () => {
this.onSelectChange(record.id.split(","), [record]); this.onSelectChange(record.id.split(','), [record])
} }
} }
} }
}, },
queryParams() { queryParams() {
let paramTarget = {} let paramTarget = {}
if(this.dynamicParam){ if (this.dynamicParam) {
//处理自定义参数 //处理自定义参数
Object.keys(this.dynamicParam).map(key=>{ Object.keys(this.dynamicParam).map(key => {
paramTarget['self_'+key] = this.dynamicParam[key] paramTarget['self_' + key] = this.dynamicParam[key]
}) })
} }
let param = Object.assign(paramTarget, this.queryParam, this.sorter); let param = Object.assign(paramTarget, this.queryParam, this.sorter)
param.pageNo = this.pagination.current; param.pageNo = this.pagination.current
param.pageSize = this.pagination.pageSize; param.pageSize = this.pagination.pageSize
return filterObj(param); return filterObj(param)
}, },
handleChangeInTableSelect(selectedRowKeys, selectionRows) { handleChangeInTableSelect(selectedRowKeys, selectionRows) {
//update-begin-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844 //update-begin-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
if(!selectedRowKeys || selectedRowKeys.length==0){ if (!selectedRowKeys || selectedRowKeys.length == 0) {
this.table.selectionRows = [] this.table.selectionRows = []
}else if(selectedRowKeys.length == selectionRows.length){ } else if (selectedRowKeys.length == selectionRows.length) {
this.table.selectionRows = selectionRows this.table.selectionRows = selectionRows
}else{ } else {
//当两者长度不一的时候 需要判断 //当两者长度不一的时候 需要判断
let keys = this.table.selectedRowKeys 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]) let combineKey = this.combineRowKey(selectionRows[i])
if(keys.indexOf(combineKey)<0){ if (keys.indexOf(combineKey) < 0) {
//如果 原来的key 不包含当前记录 push //如果 原来的key 不包含当前记录 push
rows.push(selectionRows[i]) rows.push(selectionRows[i])
} }
} }
//这个循环 移除取消选中的数据 //这个循环 移除取消选中的数据
this.table.selectionRows = rows.filter(item=>{ this.table.selectionRows = rows.filter(item => {
let combineKey = this.combineRowKey(item) let combineKey = this.combineRowKey(item)
return selectedRowKeys.indexOf(combineKey)>=0 return selectedRowKeys.indexOf(combineKey) >= 0
}) })
} }
//update-end-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844 //update-end-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
@ -345,78 +350,90 @@
this.close() this.close()
}, },
handleSubmit() { handleSubmit() {
if(!this.multi){ if (this.getFileData) {
if(this.selectionRows && this.selectionRows.length>1){ this.$emit('close')
this.$message.warning("请选择一条记录") this.visible = false
return
}
if (!this.multi) {
if (this.selectionRows && this.selectionRows.length > 1) {
this.$message.warning('请选择一条记录')
return false return false
} }
} }
if(!this.selectionRows || this.selectionRows.length==0){ if (!this.selectionRows || this.selectionRows.length == 0) {
this.$message.warning("请选择一条记录") this.$message.warning('请选择一条记录')
return false return false
} }
console.log(this.selectionRows) console.log(this.selectionRows)
this.$emit('ok', this.selectionRows); this.$emit('ok', this.selectionRows)
this.close() this.close()
}, },
close() { close() {
this.$emit('close'); this.$emit('close')
this.visible = false; this.visible = false
//this.onClearSelected() //this.onClearSelected()
}, },
show(){ show(val) {
if (val) {
this.getFileData = true
}
let data = []
data.push(val)
console.log('这是什么数据', val)
this.changeData = data
this.visible = true this.visible = true
this.loadPlan(1); this.loadPlan(1)
}, },
handleToggleSearch(){ handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus; this.toggleSearchStatus = !this.toggleSearchStatus
}, },
searchByquery(){ searchByquery() {
//this.loadData(1); //this.loadData(1);
}, },
onlyReload(){ onlyReload() {
//this.loadData(); //this.loadData();
}, },
searchReset(){ searchReset() {
Object.keys(this.queryParam).forEach(key=>{ Object.keys(this.queryParam).forEach(key => {
this.queryParam[key]="" this.queryParam[key] = ''
}) })
//this.loadData(1); //this.loadData(1);
}, },
/* onClearSelected(){ /* onClearSelected(){
this.table.selectedRowKeys = [] this.table.selectedRowKeys = []
this.table.selectionRows = [] this.table.selectionRows = []
},*/ },*/
combineRowKey(record){ combineRowKey(record) {
let res = '' let res = ''
Object.keys(record).forEach(key=>{ Object.keys(record).forEach(key => {
res+=record[key] res += record[key]
}) })
if(res.length>50){ if (res.length > 50) {
res = res.substring(0,50) res = res.substring(0, 50)
} }
return res return res
}, },
clickThenCheck(record){ clickThenCheck(record) {
return { return {
on: { on: {
click: () => { click: () => {
let rowKey = this.combineRowKey(record) let rowKey = this.combineRowKey(record)
if(!this.table.selectedRowKeys || this.table.selectedRowKeys.length==0){ if (!this.table.selectedRowKeys || this.table.selectedRowKeys.length == 0) {
let arr1=[],arr2=[] let arr1 = [], arr2 = []
arr1.push(record) arr1.push(record)
arr2.push(rowKey) arr2.push(rowKey)
this.table.selectedRowKeys=arr2 this.table.selectedRowKeys = arr2
this.table.selectionRows=arr1 this.table.selectionRows = arr1
}else{ } else {
if(this.table.selectedRowKeys.indexOf(rowKey)<0){ if (this.table.selectedRowKeys.indexOf(rowKey) < 0) {
this.table.selectedRowKeys.push(rowKey) this.table.selectedRowKeys.push(rowKey)
this.table.selectionRows.push(record) this.table.selectionRows.push(record)
}else{ } else {
let rowKey_index = this.table.selectedRowKeys.indexOf(rowKey) let rowKey_index = this.table.selectedRowKeys.indexOf(rowKey)
this.table.selectedRowKeys.splice(rowKey_index,1); this.table.selectedRowKeys.splice(rowKey_index, 1)
this.table.selectionRows.splice(rowKey_index,1); this.table.selectionRows.splice(rowKey_index, 1)
} }
} }
} }
@ -424,15 +441,15 @@
} }
}, },
//防止字典中有垃圾数据 //防止字典中有垃圾数据
initDictOptionData(dictOptions){ initDictOptionData(dictOptions) {
alert(1) alert(1)
let obj = { } let obj = {}
Object.keys(dictOptions).map(k=>{ Object.keys(dictOptions).map(k => {
obj[k] = dictOptions[k].filter(item=>{ obj[k] = dictOptions[k].filter(item => {
return item!=null return item != null
}); })
}); })
this.dictOptions = obj this.dictOptions = obj
} }
} }

34
src/components/jeecg/modal/ProcessPlan.vue
Unescape View File

@ -206,13 +206,13 @@
title: '顺序号', title: '顺序号',
align: 'center', align: 'center',
dataIndex: 'orderNumber' dataIndex: 'orderNumber'
},
{
title: '文件id',
align: 'center',
dataIndex: 'fileId',
scopedSlots: { customRender: 'fileSlot' }
} }
/* {
title: '文件id',
align: 'center',
dataIndex: 'fileId',
scopedSlots: { customRender: 'fileSlot' }
}*/
], ],
url: { url: {
list: '/hy/processUdgetPlan/list', list: '/hy/processUdgetPlan/list',
@ -243,7 +243,8 @@
superFieldList: [], superFieldList: [],
selectedRowKeys: [], selectedRowKeys: [],
modalWidth: MODAL_WIDTH, modalWidth: MODAL_WIDTH,
changeData: '' changeData: '',
getFileData: false
} }
}, },
mounted() { mounted() {
@ -291,8 +292,8 @@
} }
this.loading = false this.loading = false
}) })
this.selectedRowKeys =this.changeData this.selectedRowKeys = this.changeData
this.selectedMainId =this.changeData[0]; this.selectedMainId = this.changeData[0]
}, },
clickThenSelect(record) { clickThenSelect(record) {
return { return {
@ -356,6 +357,11 @@
this.close() this.close()
}, },
handleSubmit() { handleSubmit() {
if (this.getFileData) {
this.$emit('close')
this.visible = false
return
}
if (!this.multi) { if (!this.multi) {
if (this.selectionRows && this.selectionRows.length > 1) { if (this.selectionRows && this.selectionRows.length > 1) {
this.$message.warning('请选择一条记录') this.$message.warning('请选择一条记录')
@ -375,11 +381,13 @@
//this.onClearSelected() //this.onClearSelected()
}, },
show(val) { show(val) {
let data=[] if (val) {
this.getFileData = true
}
let data = []
data.push(val) data.push(val)
console.log('这是什么数据',data) console.log('这是什么数据', val)
this.changeData=data; this.changeData = data
// this.selectionRows= val
this.visible = true this.visible = true
this.loadPlan(1) this.loadPlan(1)
}, },

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

@ -4,6 +4,11 @@
<!-- 主表单区域 --> <!-- 主表单区域 -->
<a-form :form="form" slot="detail"> <a-form :form="form" slot="detail">
<a-row> <a-row>
<a-col :span="8" v-show="false">
<a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
</a-form-item>
</a-col>
<a-col :span="8" > <a-col :span="8" >
<a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-user-by-dep v-decorator="['createBy']" disabled/> <j-select-user-by-dep v-decorator="['createBy']" disabled/>
@ -330,8 +335,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
this.btndisabled = true; this.btndisabled = true;
var r = this.processData; var r = this.processData;
this.getAction(this.url.queryById,{ this.getAction(this.url.queryById,{
tableId:r.tableId, id:r.tableId
tableName:r.tableName,
}).then((res)=>{ }).then((res)=>{
if (res.success){ if (res.success){
let formData = res.result; let formData = res.result;
@ -410,7 +414,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
//1、文件回显 //1、文件回显
this.data = getRecord(this.data) this.data = getRecord(this.data)
} }
let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId') let fieldval = pick(this.data,'id','company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId')
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })

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

@ -4,6 +4,11 @@
<!-- 主表单区域 --> <!-- 主表单区域 -->
<a-form :form="form" slot="detail"> <a-form :form="form" slot="detail">
<a-row> <a-row>
<a-col :span="8" v-show="false">
<a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
</a-form-item>
</a-col>
<a-col :span="8" v-show="false"> <a-col :span="8" v-show="false">
<a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['id']" placeholder="" style="width: 100%"/> <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>

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

@ -4,6 +4,11 @@
<!-- 主表单区域 --> <!-- 主表单区域 -->
<a-form :form="form" slot="detail"> <a-form :form="form" slot="detail">
<a-row> <a-row>
<a-col :span="8" v-show="false">
<a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
</a-form-item>
</a-col>
<a-col :span="8" v-show="false"> <a-col :span="8" v-show="false">
<a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['id']" placeholder="" style="width: 100%" disabled/> <a-input v-decorator="['id']" placeholder="" style="width: 100%" disabled/>

8
src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
Unescape View File

@ -3,6 +3,11 @@
<j-form-container :disabled="formDisabled"> <j-form-container :disabled="formDisabled">
<a-form :form="form" slot="detail"> <a-form :form="form" slot="detail">
<a-row> <a-row>
<a-col :span="8" v-show="false">
<a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
</a-form-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-company v-decorator="['company']" multi disabled/> <j-select-company v-decorator="['company']" multi disabled/>
@ -205,8 +210,7 @@
this.btndisabled = true; this.btndisabled = true;
var r = this.processData; var r = this.processData;
this.getAction(this.url.queryById,{ this.getAction(this.url.queryById,{
tableId:r.tableId, id:r.tableId
tableName:r.tableName,
}).then((res)=>{ }).then((res)=>{
if (res.success){ if (res.success){
let formData = res.result; let formData = res.result;

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

@ -322,6 +322,9 @@
console.log(userInfo) console.log(userInfo)
// userInfo.company=company; // userInfo.company=company;
this.popupCallback(company, userInfo) this.popupCallback(company, userInfo)
if (!this.isNew){
this.init();
}
}, },
methods: { methods: {
materialType(val) { materialType(val) {
@ -335,8 +338,7 @@
this.btndisabled = true this.btndisabled = true
var r = this.processData var r = this.processData
this.getAction(this.url.queryById, { this.getAction(this.url.queryById, {
tableId: r.tableId, id: r.tableId
tableName: r.tableName
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
let formData = res.result let formData = res.result
@ -431,6 +433,7 @@
this.data = getRecord(this.data) this.data = getRecord(this.data)
} }
console.log('000000000000>',this.data)
let fieldval = pick(this.data, 'id', 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processOutflowId', 'fileId') let fieldval = pick(this.data, 'id', 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processOutflowId', 'fileId')
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)

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

@ -304,8 +304,7 @@
this.btndisabled = true; this.btndisabled = true;
var r = this.processData; var r = this.processData;
this.getAction(this.url.getForm,{ this.getAction(this.url.getForm,{
tableId:r.tableId, id:r.tableId
tableName:r.tableName,
}).then((res)=>{ }).then((res)=>{
if (res.success){ if (res.success){
let formData = res.result; let formData = res.result;

29
src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
Unescape View File

@ -128,7 +128,7 @@
{ {
title:'器材编号', title:'器材编号',
align:"center", align:"center",
dataIndex: 'equipment_dictText', dataIndex: 'equipment',
}, },
{ {
title:'WBS', title:'WBS',
@ -138,12 +138,12 @@
{ {
title:'物料名称及规格型号', title:'物料名称及规格型号',
align:"center", align:"center",
dataIndex: 'materialName_dictText', dataIndex: 'materialName',
}, },
{ {
title:'单位', title:'单位',
align:"center", align:"center",
dataIndex: 'materialUnit_dictText', dataIndex: 'materialUnit',
}, },
{ {
title:'请发数', title:'请发数',
@ -158,7 +158,7 @@
{ {
title:'供货商', title:'供货商',
align:"center", align:"center",
dataIndex: 'supplier_dictText', dataIndex: 'supplier',
}, },
{ {
title:'单价', title:'单价',
@ -173,29 +173,18 @@
{ {
title:'用途', title:'用途',
align:"center", align:"center",
dataIndex: 'purpose' dataIndex: 'purpose',
}, fixed:"right",
{
title:'删除标志',
align:"center",
dataIndex: 'delFlag'
},
{
title:'删除时间',
align:"center",
dataIndex: 'delTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
}, },
{
/*{
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
align:"center", align:"center",
fixed:"right", fixed:"right",
width:147, width:147,
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
} }*/
], ],
url: { url: {
list: "/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId", list: "/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId",

Write Preview
Loading…
Cancel
Save