Browse Source

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

dev
caoyizhong 2 years ago
parent
commit
7ab8d7aa19
  1. 154
      src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
  2. 6
      src/views/activiti/form/ProcessMaterialBorrowingForm.vue
  3. 13
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  4. 10
      src/views/activiti/form/ProcessMaterialsAllotForm.vue
  5. 10
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
  6. 6
      src/views/activiti/form/ProcessMaterialsReturnForm.vue
  7. 6
      src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
  8. 6
      src/views/activiti/form/ProcessSmaterialsScrapForm.vue
  9. 6
      src/views/activiti/form/ProcessSpecialMaterialsForm.vue
  10. 15
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  11. 6
      src/views/activiti/todoManage.vue

154
src/components/jeecgbiz/modal/JSelectUserByDepModal.vue

@ -33,30 +33,37 @@
placeholder="请输入账号"
v-model="queryParam.username"
@search="onSearch"
></a-input-search>
<a-button @click="searchReset(1)" style="margin-left: 20px" icon="redo">重置</a-button>
<!--用户列表-->
<a-table
ref="table"
:scroll="scrollTrigger"
size="middle"
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type: getType}"
:loading="loading"
@change="handleTableChange">
</a-table>
</a-card>
></a-input-search>&nbsp;
用户名:
<a-input-search
:style="{width:'150px',marginBottom:'15px'}"
placeholder="请输入用户名"
v-model="queryParam.realname"
@search="onSearch"
></a-input-search>
<a-button @click="searchReset(1)" style="margin-left: 20px" icon="redo">重置</a-button>
<!--用户列表-->
<a-table
ref="table"
:scroll="scrollTrigger"
size="middle"
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type: getType}"
:loading="loading"
@change="handleTableChange">
</a-table>
</a-card>
</a-col>
</a-row>
</j-modal>
</template>
<script>
import {filterObj} from '@/utils/util'
import {queryDepartTreeList, getUserList, queryUserByDepId} from '@/api/api'
import { filterObj } from '@/utils/util'
import { queryDepartTreeList, getUserList, queryUserByDepId } from '@/api/api'
export default {
name: 'JSelectUserByDepModal',
@ -65,7 +72,8 @@
data() {
return {
queryParam: {
username: "",
username: '',
realname: ''
},
columns: [
{
@ -82,7 +90,7 @@
title: '性别',
align: 'center',
dataIndex: 'sex',
customRender: function (text) {
customRender: function(text) {
if (text === 1) {
return '男'
} else if (text === 2) {
@ -129,13 +137,13 @@
visible: false,
form: this.$form.createForm(this),
loading: false,
expandedKeys: [],
expandedKeys: []
}
},
computed: {
// getter
getType: function () {
return this.multi == true ? 'checkbox' : 'radio';
getType: function() {
return this.multi == true ? 'checkbox' : 'radio'
}
},
watch: {
@ -144,11 +152,11 @@
handler() {
this.initUserNames()
}
},
}
},
created() {
//
this.resetScreenSize();
this.resetScreenSize()
this.loadData()
},
methods: {
@ -179,7 +187,7 @@
},
async loadData(arg) {
if (arg === 1) {
this.ipagination.current = 1;
this.ipagination.current = 1
}
if (this.selectedDepIds && this.selectedDepIds.length > 0) {
await this.initQueryUserByDepId(this.selectedDepIds)
@ -200,100 +208,100 @@
},
//
resetScreenSize() {
let screenWidth = document.body.clientWidth;
let screenWidth = document.body.clientWidth
if (screenWidth < 500) {
this.scrollTrigger = {x: 800};
this.scrollTrigger = { x: 800 }
} else {
this.scrollTrigger = {};
this.scrollTrigger = {}
}
},
showModal() {
this.visible = true;
this.queryDepartTree();
this.visible = true
this.queryDepartTree()
this.initUserNames()
this.loadData();
this.form.resetFields();
this.loadData()
this.form.resetFields()
},
getQueryParams() {
let param = Object.assign({}, this.queryParam, this.isorter);
param.field = this.getQueryField();
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
return filterObj(param);
let param = Object.assign({}, this.queryParam, this.isorter)
param.field = this.getQueryField()
param.pageNo = this.ipagination.current
param.pageSize = this.ipagination.pageSize
return filterObj(param)
},
getQueryField() {
let str = 'id,';
let str = 'id,'
for (let a = 0; a < this.columns.length; a++) {
str += ',' + this.columns[a].dataIndex;
str += ',' + this.columns[a].dataIndex
}
return str;
return str
},
searchReset(num) {
let that = this;
let that = this
if (num !== 0) {
that.queryParam = {};
that.loadData(1);
that.queryParam = {}
that.loadData(1)
}
that.selectedRowKeys = [];
that.selectUserIds = [];
that.selectedDepIds = [];
that.selectedRowKeys = []
that.selectUserIds = []
that.selectedDepIds = []
},
close() {
this.searchReset(0);
this.visible = false;
this.searchReset(0)
this.visible = false
},
handleTableChange(pagination, filters, sorter) {
//TODO
if (Object.keys(sorter).length > 0) {
this.isorter.column = sorter.field;
this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc';
this.isorter.column = sorter.field
this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
}
this.ipagination = pagination;
this.loadData();
this.ipagination = pagination
this.loadData()
},
handleSubmit() {
let that = this;
this.getSelectUserRows();
that.$emit('ok', that.selectUserRows, that.selectUserIds);
let that = this
this.getSelectUserRows()
that.$emit('ok', that.selectUserRows, that.selectUserIds)
that.searchReset(0)
that.close();
that.close()
},
//
getSelectUserRows(rowId) {
let dataSource = this.dataSource;
let userIds = "";
this.selectUserRows = [];
let dataSource = this.dataSource
let userIds = ''
this.selectUserRows = []
for (let i = 0, len = dataSource.length; i < len; i++) {
if (this.selectedRowKeys.includes(dataSource[i].id)) {
this.selectUserRows.push(dataSource[i]);
userIds = userIds + "," + dataSource[i].username
this.selectUserRows.push(dataSource[i])
userIds = userIds + ',' + dataSource[i].username
}
}
this.selectUserIds = userIds.substring(1);
this.selectUserIds = userIds.substring(1)
},
// ,
onDepSelect(selectedDepIds) {
if (selectedDepIds[0] != null) {
this.initQueryUserByDepId(selectedDepIds); // id
this.initQueryUserByDepId(selectedDepIds) // id
if (this.selectedDepIds[0] !== selectedDepIds[0]) {
this.selectedDepIds = [selectedDepIds[0]];
this.selectedDepIds = [selectedDepIds[0]]
}
}
},
onSelectChange(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
},
onSearch() {
this.loadData(1);
this.loadData(1)
},
// id
initQueryUserByDepId(selectedDepIds) {
this.loading = true
return queryUserByDepId({id: selectedDepIds.toString()}).then((res) => {
return queryUserByDepId({ id: selectedDepIds.toString() }).then((res) => {
if (res.success) {
this.dataSource = res.result;
this.ipagination.total = res.result.length;
this.dataSource = res.result
this.ipagination.total = res.result.length
}
}).finally(() => {
this.loading = false
@ -302,14 +310,14 @@
queryDepartTree() {
queryDepartTreeList().then((res) => {
if (res.success) {
this.departTree = res.result;
this.departTree = res.result
//
this.expandedKeys = this.departTree.map(item => item.id)
}
})
},
modalFormOk() {
this.loadData();
this.loadData()
}
}
}

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

@ -62,18 +62,18 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<j-form-container >
<!-- <j-form-container >
<a-form :form="form">
<a-row>
<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />-->
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>
</a-row>
</a-form>
</j-form-container>
</j-form-container>-->
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>

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

@ -109,18 +109,18 @@
:actionButton="false"/>
</a-tab-pane>
</a-tabs>
<j-form-container>
<!-- <j-form-container >
<a-form :form="form">
<a-row>
<a-col :span="24">
<a-form-item label="流程说明">
<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />-->
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>
</a-row>
</a-form>
</j-form-container>
</j-form-container>-->
<div class="div_process">
<div v-if="isGetOneAndLast">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
@ -648,9 +648,9 @@
this.btndisabled = true
httpAction(url, formData, method).then((res) => {
if (res.success) {
//this.$message.success('')
//todo
this.$emit('afterSubmit', formData)
this.$emit("close")
} else {
this.$message.error(res.message)
}
@ -768,6 +768,7 @@
},
saveAndpassTask() {
this.passTask()
this.handleSubmit();
},
validateError(msg) {
this.$message.error(msg)

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

@ -82,18 +82,18 @@
/>
</a-tab-pane>
</a-tabs>
<j-form-container>
<!-- <j-form-container >
<a-form :form="form">
<a-row>
<a-col :span="24">
<a-form-item label="流程说明">
<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />-->
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>
</a-row>
</a-form>
</j-form-container>
</j-form-container>-->
<div class="div_process">
<a-form-item v-if="!task" :wrapperCol="{ span: 24 }" style="text-align: center" >
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit" >保存</a-button>

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

@ -93,18 +93,18 @@
</c-editable-table>
</a-tab-pane>
</a-tabs>
<j-form-container>
<!-- <j-form-container >
<a-form :form="form">
<a-row>
<a-col :span="24">
<a-form-item label="流程说明">
<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />-->
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>
</a-row>
</a-form>
</j-form-container>
</j-form-container>-->
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>

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

@ -62,18 +62,18 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<j-form-container >
<!-- <j-form-container >
<a-form :form="form">
<a-row>
<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />-->
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>
</a-row>
</a-form>
</j-form-container>
</j-form-container>-->
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>

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

@ -79,18 +79,18 @@
</a-row>
</a-form>
</j-form-container>
<j-form-container >
<!-- <j-form-container >
<a-form :form="form">
<a-row>
<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />-->
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>
</a-row>
</a-form>
</j-form-container>
</j-form-container>-->
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>

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

@ -65,18 +65,18 @@
:actionButton="false"/>
</a-tab-pane>
</a-tabs>
<j-form-container >
<!-- <j-form-container >
<a-form :form="form">
<a-row>
<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />-->
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>
</a-row>
</a-form>
</j-form-container>
</j-form-container>-->
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>

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

@ -62,18 +62,18 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<j-form-container >
<!-- <j-form-container >
<a-form :form="form">
<a-row>
<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />-->
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>
</a-row>
</a-form>
</j-form-container>
</j-form-container>-->
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>

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

@ -120,18 +120,18 @@
</a-tabs>
<j-form-container>
<!-- <j-form-container >
<a-form :form="form">
<a-row>
<a-col :span="24">
<a-form-item label="流程说明">
<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />-->
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>
</a-row>
</a-form>
</j-form-container>
</j-form-container>-->
<div class="div_process">
<div v-if="isGetOneAndLast">
@ -1349,7 +1349,8 @@
this.$message.error('请选择采购类型')
return
} else {
this.passTask()
this.passTask();
this.handleSubmit();
}
}
})
@ -1411,9 +1412,9 @@
this.btndisabled = true
httpAction(url, formData, method).then((res) => {
if (res.success) {
//this.$message.success("")
//todo
this.$emit('afterSubmit', formData)
this.$emit("close")
} else {
this.$message.error(res.message)
}

6
src/views/activiti/todoManage.vue

@ -151,6 +151,7 @@
<component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
:processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType" :isSourceCapital="lcModa.isSourceCapital"
:task="true" :hieg ="lcModa.hieg"
@afterSubmit="afterSub"
@passTask="()=>passTask(lcModa.processData)"
@backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
:pictureId="lcModa.pictureId"
@ -675,6 +676,11 @@
}
})
},
afterSub(){
this.$message.success('保存成功')
this.lcModa.visible=false;
this.lcModa.disabled = false
},
backAll() {
if (this.selectCount <= 0) {
this.$message.warning('您还未选择要驳回的数据')

Loading…
Cancel
Save