Browse Source

修改入库页面按回显控制台报错问题

dev
long 2 years ago
parent
commit
ed6cf91090
  1. 1
      src/components/jeecg/HDelivery.vue
  2. 1
      src/components/jeecg/HPlan.vue
  3. 51
      src/views/activiti/applyList.vue

1
src/components/jeecg/HDelivery.vue

@ -144,6 +144,7 @@
params.vals=[];
params.ids.push(res.result.id)
params.vals.push(res.result.warehousingBatch)
params.vals=params.vals.join(",")
this.showText=params;
let dataList=[];
let data={}

1
src/components/jeecg/HPlan.vue

@ -151,6 +151,7 @@
params.vals=[];
params.ids.push(res.result.id)
params.vals.push(res.result.warehousingBatch)
params.vals=params.vals.join(",")
this.showText=params;
let dataList=[];
let data={}

51
src/views/activiti/applyList.vue

@ -165,41 +165,16 @@
@afterSubmit="afterSub" @loadData="reloadData" @close="lcModa.visible=false,lcModa.disabled = false"></component>
<!-- -->
</a-modal>
<!--提交申请表单-->
<!-- <a-modal title="提交申请" v-model="modalVisible" :mask-closable="false" :width="500" :footer="null">
<div v-if="modalVisible">
&lt;!&ndash; <a-form-item label="选择审批人" v-show="showAssign">
<a-select style="width: 100%"
v-model="form.assignees"
placeholder="请选择"
mode="multiple"
:allowClear="true"
>
<a-select-option v-for="(item, i) in assigneeList" :key="i" :value="item.username">{{item.realname}}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="下一审批人" v-show="isGateway">
<a-alert type="info" showIcon message="分支网关处不支持自定义选择下一审批人,将自动下发给所有可审批人。">将发送给下一节点所有人</a-alert>
</a-form-item>&ndash;&gt;
<a-form-item label="优先级" prop="priority">
<a-select v-model="form.priority" placeholder="请选择" :allowClear="true" style="width: 100%">
<a-select-option :value="0">普通</a-select-option>
<a-select-option :value="1">重要</a-select-option>
<a-select-option :value="2">紧急</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="消息通知" v-show="false">
<a-checkbox v-model="form.sendMessage">站内消息通知</a-checkbox>
&lt;!&ndash; <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
<a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>&ndash;&gt;
</a-form-item>
<div slot="footer">
<a-button type="text" @click="modalVisible=false">取消</a-button>
<div style="display:inline-block;width: 20px;"></div>
<a-button type="primary" :disabled="submitLoading" @click="applySubmit">提交</a-button>
</div>
</div>
</a-modal>-->
<a-modal title="提交申请" v-model="loadingData" :mask-closable="false" :width="500" :footer="null">
<a-spin tip="Loading...">
<a-alert
message="Alert message title"
description="Further details about the context of this alert."
></a-alert>
</a-spin>
</a-modal>
<a-modal title="审批历史" v-model="modalLsVisible" :mask-closable="false" :width="'80%'" :footer="null">
<div v-if="modalLsVisible">
<historicDetail :procInstId="procInstId"></historicDetail>
@ -375,7 +350,8 @@
modalLsVisible: false,
procInstId: '',
modalCancelVisible: false,
cancelForm: {}
cancelForm: {},
loadingData: false
}
},
methods: {
@ -434,6 +410,7 @@
console.log(value);
},
apply(v) {
this.loading=true
if (!v.procDefId || v.procDefId == "null") {
this.$message.error("流程定义为空");
return;
@ -444,7 +421,6 @@
//
this.getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
if (res.success) {
console.log(v,"898989898989898>")
if (res.result.type == 3 || res.result.type == 4) {
this.isGateway = true;
this.modalVisible = true;
@ -497,6 +473,7 @@
params.assignees = params.assignees.join(",")
this.postFormAction(this.url.applyBusiness,params).then(res => {
if (res.success) {
this.loading=false
this.$message.success("操作成功");
this.loadData();
this.modalVisible = false;
@ -544,6 +521,7 @@
this.modalCancelVisible = true;
},
handelSubmitCancel(v) {
this.loading=true;
this.$confirm({
title: '撤回',
content: `您确定要撤回吗?`,
@ -554,6 +532,7 @@
this.submitLoading = true;
this.postFormAction(this.url.cancelApply,this.cancelForm).then(res => {
if (res.success) {
this.loading=false
this.$message.success("操作成功");
this.loadData();
this.modalCancelVisible = false;

Loading…
Cancel
Save