问题修改

dev-scheduling
zhangdi 1 month ago
parent bc6ee6440c
commit a4ec9e9127
  1. 4
      src/views/basicData/jobTransferManagement.vue
  2. 30
      src/views/flowManagement/milestoneDialog.vue
  3. 6
      src/views/flowManagement/projectExecution.vue
  4. 2
      src/views/workLicense/workLicense.vue
  5. 8
      src/views/zhgd-work/dacangDispatch/index.vue

@ -41,7 +41,7 @@
</template>
<template #menu="scope">
<el-button type="text" @click="updateFun(scope.row)">修改</el-button>
<el-button v-show="scope.row.phStatus == 7" type="text" @click="transferToFun(scope.row)"
<el-button v-show="scope.row.phStatus == 6" type="text" @click="transferToFun(scope.row)"
>转岗</el-button
>
<!-- v-show="scope.row.phStatus == 3" -->
@ -259,7 +259,7 @@ export default {
editBtnText: '修改',
viewBtnText: '详情',
labelWidth: 120,
menuWidth: 150,
menuWidth: 190,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,

@ -232,7 +232,7 @@
</template>
<script>
import { getRoleUserList } from '@/api/processManagement/taskDispatch';
import { projectExecute, projectCheck, projectApprove } from '@/api/flowManagement/index';
import { projectExecute, projectCheck, projectApprove,getProcessDetail } from '@/api/flowManagement/index';
import { getDictionary } from '@/api/system/dict';
import jhSelect from '@/components/jh-select/index.vue';
export default {
@ -273,15 +273,39 @@ export default {
},
mounted() {
this.openShow = this.showDialog;
this.executeForm = this.rowItem;
console.log(this.detailForm, 'title');
// this.executeForm = this.rowItem;
// console.log(this.detailForm, 'title');
this.detailForm.checkResult = null;
this.subTitle = this.title;
console.log(this.rowItem, 'rowItem');
this.getRoleUserList();
this.getExecuteResult();
this.getDetails();
},
methods: {
//
getDetails() {
getProcessDetail(this.rowItem.paId).then(res => {
this.$nextTick(() => {
// let data = res.data.data;
// Object.assign(this.addForm, data);
this.executeForm = res.data.data;
// memberName
if (res.data.data.memberName) {
this.executeForm.memberName = String(res.data.data.memberName)
.split(',')
.map(id => id.trim())
.filter(Boolean);
} else {
this.executeForm.memberName = [];
}
this.$forceUpdate();
});
});
},
executeTypeChange() {
this.detailForm.delayTime = '';
},

@ -21,19 +21,19 @@
<el-button
type="text"
v-if="scope.row.approvalStatus == '3' && scope.row.checkResult == 0"
@click="executeRow(row, scope.row)"
@click="executeRow(scope.row, scope.row)"
>执行</el-button
>
<el-button
type="text"
v-if="scope.row.checkResult == 1 || scope.row.checkResult == 3"
@click="auditRow(row, scope.row)"
@click="auditRow(scope.row, scope.row)"
>核查</el-button
>
<el-button
type="text"
v-if="scope.row.gradeTitle == '待评价' && scope.row.checkResult == 2"
@click="examineRow(row, scope.row)"
@click="examineRow(scope.row, scope.row)"
>核准</el-button
>
</template>

@ -164,7 +164,7 @@ export default {
],
},
{
label: '所属班组',
label: '部门',
prop: 'deptName',
span: 24,
width: 150,

@ -63,9 +63,11 @@ export default {
};
yieldOrderConfirm(query).then(res => {
let data = res.data.data;
this.tableData = res.data.data
if(this.tableData.length<=0){
this.$message.error('订单分派失败,请到异常订单管理页面处理!')
this.tableData = res.data.data;
this.cardNo = '';
this.isAxios = true;
if (this.tableData.length <= 0) {
this.$message.error('订单分派失败,请到异常订单管理页面处理!');
}
});
// this.$ajax

Loading…
Cancel
Save