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

流程

dev
kilo 2 years ago
parent
3195374c6b
commit
70ce79e656
12 changed files with 76 additions and 66 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. 2
      src/views/activiti/doneManage.vue
  2. 2
      src/views/activiti/historicDetail.vue
  3. 2
      src/views/activiti/historicDetailBak.vue
  4. 2
      src/views/activiti/processFinishManage.vue
  5. 20
      src/views/activiti/processInsManage.vue
  6. 2
      src/views/activiti/todoManage.vue
  7. 10
      src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
  8. 28
      src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
  9. 12
      src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
  10. 22
      src/views/wastematerials/ProcessWasteMaterialsList.vue
  11. 26
      src/views/wastematerials/ProcessWasteMaterialsLists.vue
  12. 14
      src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue

2
src/views/activiti/doneManage.vue
Unescape View File

@ -126,7 +126,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { activitiMixin } from '@/views/activiti/mixins/activitiMixin'
export default {
name: "done-manage",
name: "doneManage",
mixins:[activitiMixin,JeecgListMixin],
data() {
return {

2
src/views/activiti/historicDetail.vue
Unescape View File

@ -99,7 +99,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { activitiMixin } from '@/views/activiti/mixins/activitiMixin'
export default {
name: "historic_detail",
name: "historicDetail",
mixins:[activitiMixin,JeecgListMixin],
props: {
/**/

2
src/views/activiti/historicDetailBak.vue
Unescape View File

@ -99,7 +99,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { activitiMixin } from '@/views/activiti/mixins/activitiMixin'
export default {
name: "historic_detail_bak",
name: "historicDetail_bak",
mixins:[activitiMixin,JeecgListMixin],
props: {
/**/

2
src/views/activiti/processFinishManage.vue
Unescape View File

@ -154,7 +154,7 @@ import {activitiMixin} from "./mixins/activitiMixin";
import {JeecgListMixin} from "../../mixins/JeecgListMixin";
export default {
mixins:[JeecgListMixin,activitiMixin],
name: "process-finish-manage",
name: "processFinishManage",
data() {
return {
modalLsVisible: false,

20
src/views/activiti/processInsManage.vue
Unescape View File

@ -102,6 +102,8 @@
<a-divider type="vertical" />
<a href="javascript:void(0);" style="color: #999;" @click="detail(r)" >表单数据</a>
<a-divider type="vertical" />
<a href="javascript:void(0);" style="color: #999;" @click="detailActionLog(r)" >操作记录</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
<a style="color: red;">删除</a>
</a-popconfirm>
@ -146,9 +148,11 @@
<script>
import {activitiMixin} from "./mixins/activitiMixin";
import {JeecgListMixin} from "../../mixins/JeecgListMixin";
import ProcessOperationLogList from "../operationlog/ProcessOperationLogList"
export default {
mixins:[activitiMixin,JeecgListMixin],
name: "process-ins-manage",
name: "processInsManage",
data() {
return {
openSearch: true,
@ -264,6 +268,20 @@ export default {
}
});
},
//通过流程主表id查询在流程操作记录中存入的操作记录
detailActionLog(v){
console.log(v.tableId)
if (!v.tableId){
this.$message.error("流程主表id不存在");
return;
}
this.lcModa.disabled = true;
this.lcModa.title = '查看流程业务信息：'+v.name;
this.lcModa.formComponent = this.getFormComponent(v.routeName).component;
this.lcModa.processData = v;
this.lcModa.isNew = false;
this.lcModa.visible = true;
},
detail(r) {
if (!r.routeName) {
this.$message.warning(

2
src/views/activiti/todoManage.vue
Unescape View File

@ -190,7 +190,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { activitiMixin } from '@/views/activiti/mixins/activitiMixin'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
export default {
name: "todo-manage",
name: "todoManage",
mixins:[activitiMixin,JeecgListMixin],
components:{JSelectUserByDep},
data() {

10
src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
Unescape View File

@ -164,7 +164,7 @@
{
title:'数量',
align:"center",
dataIndex: 'amount'
dataIndex: 'materialQuantity'
},
{
title:'核算属性',
@ -216,16 +216,16 @@
fieldList.push({type:'string',value:'item',text:'物料'})
fieldList.push({type:'string',value:'itemDescription',text:'物料描述'})
fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位'})
fieldList.push({type:'int',value:'amount',text:'数量'})
fieldList.push({type:'BigDecimal',value:'price',text:'单价'})
fieldList.push({type:'int',value:'materialQuantity',text:'数量'})
fieldList.push({type:'BigDecimal',value:'materialPrice',text:'单价'})
fieldList.push({type:'BigDecimal',value:'rates',text:'金额'})
fieldList.push({type:'string',value:'unitWasteWarehouseCodeId',text:'仓储地点'})
fieldList.push({type:'string',value:'freightSpace',text:'存储仓位'})
fieldList.push({type:'date',value:'productionTime',text:'生产时间'})
fieldList.push({type:'string',value:'expirationDate',text:'保质期'})
fieldList.push({type:'string',value:'batch',text:'批次',dictTable:''})
fieldList.push({type:'string',value:'supplierBatch',text:'批次',dictTable:''})
fieldList.push({type:'string',value:'arrivalNotice',text:'是否到货'})
fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
fieldList.push({type:'date',value:'storageTime',text:'入库时间'})
fieldList.push({type:'string',value:'librarySign',text:'入库人'})
fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性'})
this.superFieldList = fieldList

28
src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
Unescape View File

@ -46,7 +46,7 @@
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="入库批次">
<a-input placeholder="请选择批次" v-model="queryParam.batch"/>
<a-input placeholder="请选择批次" v-model="queryParam.supplierBatch"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
@ -60,7 +60,7 @@
style="width: 210px"
format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']"
@change="onDateChangeinboundTime"
@change="onDateChangestorageTime"
/>
</a-form-item>
</a-col>
@ -168,9 +168,9 @@
unitWasteWarehouseCodeId: null,
freightSpace: null,
productionTime: null,
batch: null,
supplierBatch: null,
expirationDate: null,
inboundTime: null,
storageTime: null,
librarySign: null,
},
description: '物资总库管理详情页面',
@ -223,12 +223,12 @@
{
title:'数量',
align:"center",
dataIndex: 'amount'
dataIndex: 'materialQuantity'
},
{
title:'单价',
align:"center",
dataIndex: 'price'
dataIndex: 'materialPrice'
},
{
title:'金额',
@ -261,7 +261,7 @@
{
title:'批次',
align:"center",
dataIndex: 'batch'
dataIndex: 'supplierBatch'
},
{
title:'是否到货',
@ -328,7 +328,7 @@
this.queryParam.productDateBegin=dateString[0];
this.queryParam.productDateEnd=dateString[1];
},
onDateChangeinboundTime: function (value, dateString) {
onDateChangestorageTime: function (value, dateString) {
this.queryParam.inboundDateBegin=dateString[0];
this.queryParam.inboundDateEnd=dateString[1];
},
@ -341,9 +341,9 @@
unitWasteWarehouseCodeId: null,
freightSpace: null,
productionTime: null,
batch: null,
supplierBatch: null,
expirationDate: null,
inboundTime: null,
storageTime: null,
librarySign: null,
del_flag: 0
},
@ -378,16 +378,16 @@
fieldList.push({type:'string',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位',dictCode:''})
fieldList.push({type:'int',value:'amount',text:'数量',dictCode:''})
fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
fieldList.push({type:'int',value:'materialQuantity',text:'数量',dictCode:''})
fieldList.push({type:'BigDecimal',value:'materialPrice',text:'单价',dictCode:''})
fieldList.push({type:'BigDecimal',value:'rates',text:'金额',dictCode:''})
fieldList.push({type:'string',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'date',value:'productionTime',text:'生产时间'})
fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
fieldList.push({type:'string',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'supplierBatch',text:'批次',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'int',value:'arrivalNotice',text:'是否到货',dictCode:''})
fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
fieldList.push({type:'date',value:'storageTime',text:'入库时间'})
fieldList.push({type:'string',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性',dictCode:''})
this.superFieldList = fieldList

12
src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
Unescape View File

@ -44,12 +44,12 @@
</a-col>
<a-col :span="8">
<a-form-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['amount']" placeholder="请输入数量" />
<a-input v-decorator="['materialQuantity']" placeholder="请输入数量" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="单价（元）" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['price']" placeholder="请输入单价（元）" />
<a-input v-decorator="['materialPrice']" placeholder="请输入单价（元）" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -79,7 +79,7 @@
</a-col>
<a-col :span="8">
<a-form-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['batch']" type="list" :trigger-change="true" placeholder="请选择批次" />
<a-input v-decorator="['supplierBatch']" type="list" :trigger-change="true" placeholder="请选择批次" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -92,7 +92,7 @@
</a-col>
<a-col :span="8">
<a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择入库时间" v-decorator="['inboundTime']" :trigger-change="true" style="width: 100%" />
<j-date placeholder="请选择入库时间" v-decorator="['storageTime']" :trigger-change="true" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -209,7 +209,7 @@
this.model = Object.assign({}, record);
this.visible = true;
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'processId','supplierId','supplierDescription','itemGroup','item','itemDescription','unitMeasurement','amount','price','rates','unitWasteWarehouseCodeId','freightSpace','productionTime','expirationDate','batch','arrivalNotice','inboundTime','librarySign','accountingAttributes'))
this.form.setFieldsValue(pick(this.model,'processId','supplierId','supplierDescription','itemGroup','item','itemDescription','unitMeasurement','materialQuantity','materialPrice','rates','unitWasteWarehouseCodeId','freightSpace','productionTime','expirationDate','supplierBatch','arrivalNotice','storageTimeTime','librarySign','accountingAttributes'))
})
},
//渲染流程表单数据
@ -255,7 +255,7 @@
})
},
popupCallback(row){
this.form.setFieldsValue(pick(row,'processId','supplierId','supplierDescription','itemGroup','item','itemDescription','unitMeasurement','amount','price','rates','unitWasteWarehouseCodeId','freightSpace','productionTime','expirationDate','batch','arrivalNotice','inboundTime','librarySign','accountingAttributes'))
this.form.setFieldsValue(pick(row,'processId','supplierId','supplierDescription','itemGroup','item','itemDescription','unitMeasurement','materialQuantity','materialPrice','rates','unitWasteWarehouseCodeId','freightSpace','productionTime','expirationDate','supplierBatch','arrivalNotice','storageTime','librarySign','accountingAttributes'))
},
}
}

22
src/views/wastematerials/ProcessWasteMaterialsList.vue
Unescape View File

@ -12,7 +12,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="物料">
<a-input placeholder="请输入物料" v-model="queryParam.material"></a-input>
<a-input placeholder="请输入物料" v-model="queryParam.materialNumber"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -26,14 +26,6 @@
<!-- <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></a-input>-->
</a-form-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="帐外物资库">-->
<!-- &lt;!&ndash; <a-input placeholder="帐外物资库" v-model="queryParam.materialsUnit"></a-input>&ndash;&gt;-->
<!-- <a-select v-model="queryParam.materialsUnit" placeholder="请选择" >-->
<!-- <a-select-option v-for="(item,index) in libraryNames" :key="index" :value="item.id">{{item.libraryName}}</a-select-option>-->
<!-- </a-select>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
</a-row>
</a-form>
</div>
@ -153,7 +145,7 @@
{
title:'物料',
align:"center",
dataIndex: 'material'
dataIndex: 'materialNumber'
},
{
title:'物料描述',
@ -234,18 +226,18 @@
fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictCode:''})
fieldList.push({type:'string',value:'materialGroup',text:'物料组',dictCode:''})
fieldList.push({type:'string',value:'material',text:'物料',dictCode:''})
fieldList.push({type:'string',value:'materialNumber',text:'物料',dictCode:''})
fieldList.push({type:'string',value:'materialDescription',text:'物料描述',dictCode:''})
fieldList.push({type:'string',value:'materialStorageId',text:'库存位置',dictCode:''})
fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
fieldList.push({type:'string',value:'materialsUnit',text:'计量单位',dictCode:''})
fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
fieldList.push({type:'int',value:'materialQuantity',text:'数量',dictCode:''})
fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
fieldList.push({type:'BigDecimal',value:'materialAmount',text:'金额',dictCode:''})
fieldList.push({type:'date',value:'productionDate',text:'生产日期'})
fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
fieldList.push({type:'Date',value:'inboundTime',text:'入库时间',dictCode:''})
fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
fieldList.push({type:'Date',value:'storageTime',text:'入库时间',dictCode:''})
fieldList.push({type:'string',value:'librarySign',text:'入库人',dictCode:''})
fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性',dictCode:''})
fieldList.push({type:'string',value:'libraryNames',text:'库存位置',dictCode:''})
this.superFieldList = fieldList

26
src/views/wastematerials/ProcessWasteMaterialsLists.vue
Unescape View File

@ -22,7 +22,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="物料">
<a-input placeholder="请输入物料" v-model="queryParam.material" ></a-input>
<a-input placeholder="请输入物料" v-model="queryParam.materialNumber" ></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -156,12 +156,12 @@
supplier: null,
supplierDescription: null,
materialGroup : null,
material : null,
materialNumber : null,
materialDescription: null,
theirTeam: null,
productionDate: null,
expirationDate: null,
inboundTime: null,
storageTime: null,
materialsState: null,
descriptionId: this.$route.params.descriptionId,
del_flag: 0
@ -202,7 +202,7 @@
{
title:'物料',
align:"center",
dataIndex: 'material'
dataIndex: 'materialNumber'
},
{
title:'物料描述',
@ -227,7 +227,7 @@
{
title:'数量',
align:"center",
dataIndex: 'number'
dataIndex: 'materialQuantity'
},
{
title:'单价(元)',
@ -237,7 +237,7 @@
{
title:'金额(元)',
align:"center",
dataIndex: 'money'
dataIndex: 'materialAmount'
},
{
title:'生产日期',
@ -255,12 +255,12 @@
{
title:'入库时间',
align:"center",
dataIndex: 'inboundTime'
dataIndex: 'storageTime'
},
{
title:'入库人',
align:"center",
dataIndex: 'warehousePeople'
dataIndex: 'librarySign'
},
{
title: '核算属性',
@ -363,18 +363,18 @@
fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictCode:''})
fieldList.push({type:'string',value:'materialGroup',text:'物料组',dictCode:''})
fieldList.push({type:'string',value:'material',text:'物料',dictCode:''})
fieldList.push({type:'string',value:'materialNumber',text:'物料',dictCode:''})
fieldList.push({type:'string',value:'materialDescription',text:'物料描述',dictCode:''})
fieldList.push({type:'string',value:'materialStorageId',text:'库存位置',dictCode:''})
fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
fieldList.push({type:'string',value:'materialsUnit',text:'计量单位',dictCode:''})
fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
fieldList.push({type:'int',value:'materialQuantity',text:'数量',dictCode:''})
fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
fieldList.push({type:'BigDecimal',value:'materialAmount',text:'金额',dictCode:''})
fieldList.push({type:'date',value:'productionDate',text:'生产日期'})
fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
fieldList.push({type:'date',value:'inboundTime',text:'入库时间',dictCode:''})
fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
fieldList.push({type:'date',value:'storageTime',text:'入库时间',dictCode:''})
fieldList.push({type:'string',value:'librarySign',text:'入库人',dictCode:''})
fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性',dictCode:''})
this.superFieldList = fieldList
}

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

@ -35,17 +35,17 @@
</a-col>
<a-col :span="12">
<a-form-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['number']" placeholder="请输入数量" ></a-input>
<a-input v-decorator="['materialQuantity']" placeholder="请输入数量" ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['price']" placeholder="请输入单价" ></a-input>
<a-input v-decorator="['materialPrice']" placeholder="请输入单价" ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['money']" placeholder="请输入金额" ></a-input>
<a-input v-decorator="['materialAmount']" placeholder="请输入金额" ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
@ -60,12 +60,12 @@
</a-col>
<a-col :span="12">
<a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date v-decorator="['inboundTime']" placeholder="请输入入库时间" ></j-date>
<j-date v-decorator="['storageTime']" placeholder="请输入入库时间" ></j-date>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="入库人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['warehousePeople']" placeholder="请输入入库人" ></a-input>
<a-input v-decorator="['librarySign']" placeholder="请输入入库人" ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
@ -174,7 +174,7 @@
this.model = Object.assign({}, record);
this.visible = true;
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unit','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
this.form.setFieldsValue(pick(this.model,'supplier','supplierDescription','materialGroup','materialNumber','materialDescription','materialStorageId','freightSpace','unit','number','materialPrice','materialAmount','productionDate','expirationDate','storageTime','librarySign','accountingAttributes'))
})
},
//渲染流程表单数据
@ -220,7 +220,7 @@
})
},
popupCallback(row){
this.form.setFieldsValue(pick(row,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unit','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
this.form.setFieldsValue(pick(row,'supplier','supplierDescription','materialGroup','materialNumber','materialDescription','materialStorageId','freightSpace','unit','number','materialPrice','materialAmount','productionDate','expirationDate','storageTimeTime','librarySign','accountingAttributes'))
},
}
}

Write Preview
Loading…
Cancel
Save