Sfoglia il codice sorgente

项目管理流程
销售退货字段休息

Z 2 anni fa
parent
commit
da01b23ddf

+ 47 - 0
src/api/bpm/components/project-manage/index.js

@@ -0,0 +1,47 @@
+import request from '@/utils/request';
+
+/**
+ * 项目修改
+ * @data data
+ */
+export async function projectsUpdateAPI(data) {
+  const res = await request.put('/pro/projects/update', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 项目详情
+ * @id id
+ */
+export async function projectsGetByIdAPI(id) {
+  const res = await request.get(`/pro/projects/getById/${id}`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 项目查询项目结构树
+ * @id id
+ */
+export async function projectsToTreeAPI() {
+  const res = await request.get(`/pro/projects/selectProjectsToTree`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+/**
+ * 提交
+ */
+export async function submit(data) {
+  const res = await request.post(`/bpm/pro/project/submit`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 69 - 0
src/api/bpm/components/project-manage/plan.js

@@ -0,0 +1,69 @@
+import request from '@/utils/request';
+
+/**
+ * 查询计划列表
+ * @data data
+ */
+export async function projectsPlanPageAPI(data) {
+  const res = await request.post('/pro/targetplan/page', data);
+  if (res.data.code == 0) {
+    return res.data.data.list;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 保存计划
+ * @data data
+ */
+export async function projectsPlanSaveAPI(data) {
+  const res = await request.post('/pro/targetplan/save', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 修改计划
+ * @data data
+ */
+export async function projectsPlanUpdateAPI(data) {
+  const res = await request.put('/pro/targetplan/update', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 计划详情
+ * @id id
+ */
+export async function projectsPlanGetByIdAPI(id) {
+  const res = await request.get(`/pro/targetplan/getById/${id}`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 计划删除
+ * @id id
+ */
+export async function projectsPlanDeleteAPI(data) {
+  const res = await request.delete(`/pro/targetplan/delete`,{data});
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 提交
+ */
+export async function submit(data) {
+  const res = await request.post(`/bpm/pro/targetplan/submit`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 8 - 0
src/enum/dict.js

@@ -101,3 +101,11 @@ export const reviewStatus = {
   2: '已审核',
   3: '审核不通过'
 };
+//项目管理——项目、计划、任务状态
+export const proStatusEnum = [
+  { value: 0, label: '未开始' },
+  { value: 1, label: '执行中' },
+  { value: 2, label: '暂停中' },
+  { value: 3, label: '已完成' },
+  { value: 4, label: '已终止' }
+];

+ 75 - 0
src/views/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue

@@ -0,0 +1,75 @@
+<template>
+  <div>
+    <headerTitle title="计划信息"></headerTitle>
+    <plan-form ref="planForm" :dialog-type="dialogType" :dialogForm="dialogForm"></plan-form>
+    <headerTitle title="计划节点"></headerTitle>
+    <plan-info-table ref="planInfoTable" :dialog-type="dialogType" :dialogForm="dialogForm"></plan-info-table>
+  </div>
+</template>
+
+<script>
+
+import PlanForm from "@/views/bpm/handleTask/components/project-manage/plan-manage/plan-form.vue";
+import planInfoTable from "@/views/bpm/handleTask/components/project-manage/plan-manage/planInfoTable.vue";
+import {projectsPlanGetByIdAPI} from "@/api/bpm/components/project-manage/plan";
+import {deepClone} from "ele-admin/lib/utils/core";
+
+export default {
+  name: "project-form",
+  components: {PlanForm, planInfoTable},
+  props: {
+    dialogType: {
+      type: String,
+      default: 'view',
+    },
+    businessId: {
+      default: ''
+    },
+    taskId: {
+      default: ''
+    },
+    taskDefinitionKey: {
+      default: ''
+    }
+  },
+  data() {
+    return {
+      dialogForm: {},
+
+
+    }
+  },
+  async created() {
+
+
+    await this.getProjectPlanInfo(this.businessId)
+  },
+
+  methods: {
+
+    async getProjectPlanInfo(id = '') {
+      let res = await projectsPlanGetByIdAPI(id)
+      this.dialogForm = deepClone(res)
+    },
+
+
+    getTableValue() {
+      return new Promise((resolve, reject) => {
+        this.$refs.form.validate(valid => {
+          if (!valid) {
+            this.$message.warning('有必填项未填,请检查')
+            reject('有必填项未填,请检查')
+          } else {
+            resolve(this.form)
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+
+
+<style scoped lang="scss">
+
+</style>

+ 199 - 0
src/views/bpm/handleTask/components/project-manage/plan-manage/plan-form.vue

@@ -0,0 +1,199 @@
+<template>
+  <div>
+    <el-form ref="form" :model="form" :rules="rules" class="el-form-box" label-width="120px">
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item
+            prop="projectId"
+            label="关联项目">
+            <el-row :gutter="8">
+              <el-col :span="22">
+                <ele-tree-select
+                  :disabled="dialogType=='view'"
+                  clearable
+                  filterable
+                  :data="projectList"
+                  v-model="form.projectId"
+                  childrenKey="projectList"
+                  valueKey="id"
+                  labelKey="name"
+                  placeholder="请选择"
+                  default-expand-all
+                />
+              </el-col>
+              <el-col :span="1">
+
+                <el-popover
+                  placement="right"
+                  v-model="popoverFlag"
+                  width="1000"
+                  trigger="click">
+                  <headerTitle title="项目信息"></headerTitle>
+                  <project-form ref="projectForm" dialog-type="view"></project-form>
+                  <el-button :disabled="!form.projectId" type="text" slot="reference"
+                             @click="getProjectInfo(form.projectId)">详情
+                  </el-button>
+                </el-popover>
+
+              </el-col>
+            </el-row>
+
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="name"
+            label="计划名称">
+            <el-input v-model="form.name" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            label="计划编码">
+            <el-input v-model="form.code" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item
+            prop="planStartDate"
+            label="计划开始日期">
+            <el-date-picker
+              style="width: 100%"
+              :disabled="dialogType=='view'"
+              v-model="form.planStartDate"
+              :picker-options="{disabledDate:(time)=>{return form.planEndDate&&time.getTime()>new Date(form.planEndDate)}}"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="planEndDate"
+            label="计划完成日期">
+            <el-date-picker
+              style="width: 100%"
+              :disabled="dialogType=='view'"
+              :picker-options="{disabledDate:(time)=>{return form.planStartDate&&time.getTime()<new Date(form.planStartDate)}}"
+              v-model="form.planEndDate"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="responsibleUserId"
+            label="负责人">
+            <personSelect
+              :disabled="dialogType=='view'"
+              ref="directorRef"
+              v-model="form.responsibleUserId"
+              @selfChange="personChange"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input type="textarea" :rows="2" v-model="form.remark" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import {projectsGetByIdAPI, projectsToTreeAPI} from "@/api/bpm/components/project-manage";
+import PersonSelect from "@/components/CommomSelect/person-select.vue";
+import {getByCode} from "@/api/system/dictionary-data";
+import ProjectForm from "./project-form.vue";
+
+export default {
+  name: "plan-form",
+  components: {ProjectForm, PersonSelect},
+  props: {
+    dialogType: {
+      type: String,
+      default: '',
+
+    },
+    dialogForm: {
+      type: Object,
+      default: () => {
+        return {
+          ...this.form
+        }
+      }
+    }
+  },
+  watch: {
+    dialogForm: {
+      handler(val) {
+        this.form = {...this.dialogForm}
+      },
+      deep: true,
+    },
+  },
+  data() {
+    return {
+      form: {
+        id: '',
+        projectId: '',
+        name: '',
+        code: '',
+        responsibleUserName: '',
+        responsibleUserId: '',
+        remark: '',
+        planStartDate: '',
+        planEndDate: '',
+      },
+      popoverFlag: false,
+      projectList: [],
+      rules: {
+        projectId: {required: true, message: '请选择项目', trigger: 'change'},
+        name: {required: true, message: '请输入项目名称', trigger: 'blur'},
+        planStartDate: {required: true, message: '请选择计划开始日期', trigger: 'change'},
+        planEndDate: {required: true, message: '请选择计划完成日期', trigger: 'change'},
+        responsibleUserId: {required: true, message: '请选择负责人', trigger: 'change'},
+      }
+    }
+  },
+  async created() {
+    this.projectList = await projectsToTreeAPI({processStatus: '2'})
+
+  },
+  methods: {
+    getProjectInfo(id) {
+      this.popoverFlag = true;
+      this.$nextTick(() => {
+        this.$refs.projectForm.getInfo(id);
+      })
+    },
+    personChange(val, info) {
+      this.form.responsibleUserName = info.name;
+    },
+    validForm() {
+      return new Promise((resolve, reject) => {
+        this.$refs.form.validate(valid => {
+          if (!valid) {
+            this.$message.warning('有必填项未填,请检查')
+            reject('有必填项未填,请检查')
+          } else {
+            resolve(this.form)
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+
+
+<style scoped lang="scss">
+
+</style>

+ 353 - 0
src/views/bpm/handleTask/components/project-manage/plan-manage/planInfoTable.vue

@@ -0,0 +1,353 @@
+<template>
+  <div>
+    <el-form ref="form" :model="form">
+
+      <!-- 数据表格 -->
+      <ele-pro-table
+        ref="table"
+        :columns="columns"
+        :datasource="form.datasource"
+        :needPage="false"
+        :toolkit="[]"
+        :minHeight="100"
+        :maxHeight="300"
+        tool-class="ele-toolbar-form"
+        cache-key="eomContactPageTable"
+      >
+        <!-- 表头工具栏 -->
+        <template v-slot:toolbar>
+          <el-button
+            v-if="dialogType!=='view'"
+            size="small"
+            type="primary"
+            icon="el-icon-plus"
+            class="ele-btn-icon"
+            @click="handleAddInfo">
+            新增计划节点
+          </el-button>
+        </template>
+
+        <template v-slot:action="{row,$index}">
+          <el-popconfirm
+            class="ele-action"
+            title="确定要删除此信息吗?"
+            :disabled="form.datasource.length==1"
+            @confirm="handleDelInfo($index)"
+          >
+            <template v-slot:reference>
+              <el-link
+                :disabled="form.datasource.length==1"
+                type="danger"
+                :underline="false"
+                icon="el-icon-delete"
+              >
+                删除
+              </el-link>
+            </template>
+          </el-popconfirm>
+        </template>
+        <template v-slot:name="{row,$index}" v-if="dialogType!=='view'">
+          <el-form-item :prop="'datasource.'+$index+'.name'"
+                        :rules="{required:true,message:'请选择',trigger:['blur','change']}">
+            <el-input v-model="row.name" clearable></el-input>
+          </el-form-item>
+        </template>
+        <template v-slot:stage="{row,$index}" v-if="dialogType!=='view'">
+          <el-form-item :prop="'datasource.'+$index+'.stage'">
+            <el-input v-model="row.stage" clearable></el-input>
+          </el-form-item>
+        </template>
+        <template v-slot:planStartDate="{row,$index}" v-if="dialogType!=='view'">
+          <el-form-item :prop="'datasource.'+$index+'.planStartDate'"
+                        :rules="{required:true,message:'请选择',trigger:['blur','change']}">
+            <el-date-picker
+              style="width: 100%"
+              :disabled="dialogType=='view'"
+              v-model="row.planStartDate"
+              :picker-options="{disabledDate:(time)=>{return row.planEndDate&&time.getTime()>new Date(row.planEndDate)}}"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </template>
+        <template v-slot:planEndDate="{row,$index}" v-if="dialogType!=='view'">
+          <el-form-item :prop="'datasource.'+$index+'.planEndDate'"
+                        :rules="{required:true,message:'请选择',trigger:['blur','change']}">
+            <el-date-picker
+              style="width: 100%"
+              :disabled="dialogType=='view'"
+              :picker-options="{disabledDate:(time)=>{return row.planStartDate&&time.getTime()<new Date(row.planStartDate)}}"
+              v-model="row.planEndDate"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </template>
+        <template v-slot:responsibleUserId="{row,$index}">
+          <el-form-item :prop="'datasource.'+$index+'.responsibleUserId'">
+            <personSelect
+              :disabled="dialogType=='view'"
+              :ref="'directorRef'+$index"
+              v-model="row.responsibleUserId"
+              @selfChange="personChange"/>
+          </el-form-item>
+        </template>
+        <template v-slot:isMilepost="{row,$index}" v-if="dialogType!=='view'">
+          <el-form-item>
+            <el-select v-model="row.isMilepost">
+              <el-option label="否" :value="0" />
+              <el-option label="是" :value="1" />
+            </el-select>
+          </el-form-item>
+        </template>
+        <template v-slot:milepost="{row,$index}" v-if="dialogType!=='view'">
+          <el-form-item>
+            <el-input  v-model="row.milepost" clearable></el-input>
+          </el-form-item>
+        </template>
+        <template v-slot:deliverContent="{row,$index}" v-if="dialogType!=='view'">
+          <el-form-item>
+            <el-input type="textarea" v-model="row.deliverContent" clearable></el-input>
+          </el-form-item>
+        </template>
+        <template v-slot:remark="{row,$index}" v-if="dialogType!=='view'">
+          <el-form-item>
+            <el-input type="textarea" v-model="row.remark" clearable></el-input>
+          </el-form-item>
+        </template>
+        <template v-slot:headerRequired="{column}">
+          <span class="is-required">{{ column.label }}</span>
+        </template>
+      </ele-pro-table>
+    </el-form>
+
+
+  </div>
+</template>
+
+
+<script>
+
+
+import {mapGetters} from 'vuex'
+import {getByCode} from "@/api/system/dictionary-data";
+import fileUpload from "@/components/upload/fileUpload.vue";
+import {getFile} from "@/api/system/file";
+import PersonSelect from "@/components/CommomSelect/person-select.vue";
+import {proStatusEnum} from "@/enum/dict";
+
+export default {
+  name: "relatedInfoTable",
+  components: {
+    PersonSelect,
+    fileUpload,
+
+  },
+  props: {
+    dialogForm: {
+      type: Object,
+      default: () => {
+        return {
+          ...this.form
+        }
+      }
+    },
+    dialogType: {
+      type: String,
+      default: ''
+    },
+  },
+  watch: {
+    dialogForm: {
+      handler(val) {
+        this.form.datasource = this.dialogForm.planStageList
+      },
+      deep: true,
+    },
+  },
+  data() {
+    return {
+      editIndex: undefined,//当前修改数据的下标
+      form: {
+        datasource: []
+      },
+
+    }
+  },
+  computed: {
+    columns() {
+      let list = [
+        {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          showOverflowTooltip: true,
+          fixed: 'left'
+        },
+        {
+          prop: 'name',
+          label: '节点名称',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120,
+          slot: 'name',
+          headerSlot: 'headerRequired',
+        },
+        {
+          prop: 'stage',
+          label: '计划节点',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120,
+          slot: 'stage',
+          headerSlot: 'headerRequired',
+        },
+        {
+          prop: 'planStartDate',
+          label: '开始时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 170,
+          slot: 'planStartDate',
+          headerSlot: 'headerRequired',
+        },
+        {
+          prop: 'planEndDate',
+          label: '结束时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 170,
+          slot: 'planEndDate',
+          headerSlot: 'headerRequired',
+        },
+        {
+          prop: 'responsibleUserId',
+          label: '责任人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 130,
+          slot: 'responsibleUserId',
+          headerSlot: 'headerRequired',
+        },
+        {
+          prop: 'isMilepost',
+          label: '是否里程碑',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120,
+          slot: 'isMilepost',
+        },
+        {
+          prop: 'deliverContent',
+          label: '交付物说明',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 160,
+          slot: 'deliverContent',
+        },
+        {
+          prop: 'remark',
+          label: '备注',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 160,
+          slot: 'remark',
+        },
+        {
+          prop: 'status',
+          label: '状态',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 130,
+          formatter: (_row, _column, cellValue) => {
+            return proStatusEnum[_row.status].label;
+          }
+        },
+
+      ]
+      let action = [{
+        columnKey: 'action',
+        slot: 'action',
+        label: '操作',
+        resizable: false,
+        width: 80,
+        align: 'center',
+        showOverflowTooltip: true,
+        fixed: 'right'
+      },]
+      this.dialogType === 'view' ? list = [...list] : list = [...list, ...action]
+      return list
+    },
+  },
+  async mounted() {
+    this.form.datasource = this.link
+  },
+  methods: {
+    personChange(val, info) {
+      this.form.responsibleUserName = info.name;
+    },
+    downloadFile(file) {
+      getFile({objectName: file.storePath}, file.name);
+    },
+    //新增计划数据
+    handleAddInfo() {
+      this.form.datasource.push(
+        {
+          deliverContent: '',
+          milepost: '',
+          isMilepost: 0,
+          responsibleUserId: '',
+          responsibleUserName: '',
+          planStartDate: '',
+          planEndDate: '',
+          name: '',
+          stage: '',
+          status: 0,
+          remark: '',
+        }
+      )
+    },
+    //
+    clearData() {
+      this.form.datasource.forEach((item, index) => {
+        this.$set(this.form.datasource[index], 'deliverContent', '')
+        this.$set(this.form.datasource[index], 'milepost', '')
+        this.$set(this.form.datasource[index], 'isMilepost', 0)
+        this.$set(this.form.datasource[index], 'responsibleUserId', '')
+        this.$set(this.form.datasource[index], 'responsibleUserName', '')
+        this.$set(this.form.datasource[index], 'planStartDate', '')
+        this.$set(this.form.datasource[index], 'planEndDate', '')
+        this.$set(this.form.datasource[index], 'name', '')
+        this.$set(this.form.datasource[index], 'stage', '')
+      })
+    },
+
+    //删除关联信息数据
+    handleDelInfo(index) {
+      this.form.datasource.splice(index, 1)
+    },
+    getTableValidate() {
+      return new Promise((resolve, reject) => {
+        if (this.form.datasource.length == 0) return this.$message.warning('请填写计划节点')
+        this.$refs.form.validate((valid) => {
+          if (!valid) {
+            this.$message.warning('有必填项未填,请检查')
+            reject('有必填项未填,请检查')
+          } else {
+            resolve(this.form.datasource)
+          }
+        })
+      })
+    },
+  }
+}
+</script>
+
+
+<style scoped lang="scss">
+:deep(.el-form-item) {
+  margin-bottom: 0;
+}
+</style>

+ 219 - 0
src/views/bpm/handleTask/components/project-manage/plan-manage/project-form.vue

@@ -0,0 +1,219 @@
+<template>
+  <div>
+    <el-form ref="form" :model="form" :rules="rules" class="el-form-box" label-width="120px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item
+            prop="type"
+            label="项目类型">
+            <dict-selection dict-name="项目类型" v-model="form.type" :disabled="dialogType=='view'"></dict-selection>
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="code"
+            label="项目编码">
+            <el-input disabled v-model="form.code"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="name"
+            label="项目名称">
+            <el-input v-model="form.name" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="从属项目">
+            <ele-tree-select
+              :disabled="dialogType=='view'"
+              clearable
+              filterable
+              :data="projectList"
+              v-model="form.parentId"
+              childrenKey="projectList"
+              valueKey="id"
+              labelKey="name"
+              placeholder="请选择"
+              default-expand-all
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="responsibleUserId"
+            label="项目经理">
+            <personSelect
+              :disabled="dialogType=='view'"
+              ref="directorRef"
+              v-model="form.responsibleUserId"
+              @selfChange="personChange"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="cycle"
+            label="项目周期">
+            <el-input v-model="form.cycle" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="项目预算">
+            <el-input type="number" :min="0" v-model="form.budget" :disabled="dialogType=='view'">
+              <template slot="append">
+                元
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="planStartDate"
+            label="计划开始日期">
+            <el-date-picker
+              style="width: 100%"
+              :disabled="dialogType=='view'"
+              v-model="form.planStartDate"
+              :picker-options="{disabledDate:(time)=>{return form.planEndDate&&time.getTime()>new Date(form.planEndDate)}}"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="planEndDate"
+            label="计划完成日期">
+            <el-date-picker
+              style="width: 100%"
+              :disabled="dialogType=='view'"
+              :picker-options="{disabledDate:(time)=>{return form.planStartDate&&time.getTime()<new Date(form.planStartDate)}}"
+              v-model="form.planEndDate"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="客户名称">
+            <el-input v-model="form.contactName" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="contactRelationPhone"
+            label="客户联系电话">
+            <el-input v-model="form.contactRelationPhone" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="stage"
+            label="项目阶段">
+            <el-input v-model="form.stage" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="项目优先级">
+            <dict-selection dict-name="项目优先级别" v-model="form.level"
+                            :disabled="dialogType=='view'"></dict-selection>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="项目说明">
+            <el-input type="textarea" :rows="2" v-model="form.content" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input type="textarea" :rows="2" v-model="form.remark" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+  </div>
+</template>
+
+<script>
+import {projectsGetByIdAPI, projectsToTreeAPI} from "@/api/bpm/components/project-manage";
+import PersonSelect from "@/components/CommomSelect/person-select.vue";
+import {getByCode} from "@/api/system/dictionary-data";
+
+export default {
+  name: "project-form",
+  components: {PersonSelect},
+  props: {
+    dialogType: {
+      type: String,
+      default: '',
+    }
+  },
+  data() {
+    return {
+      form: {
+        budget: '',
+        code: "",
+        contactId: '',
+        contactName: "",
+        contactRelationPhone: "",
+        contactRelationUserId: '',
+        contactRelationUserName: "",
+        content: "",
+        cycle: "",
+        deptUserId: '',
+        deptUserName: "",
+        level: "",
+        monitorUserId: '',
+        monitorUserName: "",
+        planStartDate: "",
+        planEndDate: "",
+        name: "",
+        parentId: '',
+        remark: "",
+        responsibleUserId: '',
+        responsibleUserName: "",
+        stage: "",
+        type: '',
+      },
+      projectList: [],
+      rules: {}
+    }
+  },
+  async created() {
+    this.projectList = await projectsToTreeAPI({processStatus: '2'})
+    this.setD(this.form.id, this.form.parentId, () => {
+    })
+  },
+
+  methods: {
+    setD(val, parentId, callback) {
+
+    },
+    async getInfo(id) {
+      this.form = await projectsGetByIdAPI(id)
+      this.form.type = this.form.type + ''
+      this.form.parentId = this.form.parentId == 0 ? '' : this.form.parentId
+      return this.form
+    },
+  }
+}
+</script>
+
+
+<style scoped lang="scss">
+
+</style>

+ 160 - 0
src/views/bpm/handleTask/components/project-manage/plan-manage/submit.vue

@@ -0,0 +1,160 @@
+<template>
+  <el-col :span="16" :offset="6">
+    <el-form label-width="100px" ref="formRef" :model="form">
+      <el-form-item
+        label="审批建议"
+        prop="reason"
+        style="margin-bottom: 20px"
+        :rules="{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        }"
+      >
+        <el-input
+          type="textarea"
+          v-model="form.reason"
+          placeholder="请输入审批建议"
+        />
+      </el-form-item>
+    </el-form>
+    <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
+      <el-button
+        icon="el-icon-edit-outline"
+        type="success"
+        size="mini"
+        @click="handleAudit(1)"
+        >通过
+      </el-button>
+
+      <el-button
+        icon="el-icon-circle-close"
+        type="danger"
+        size="mini"
+        @click="handleAudit(0)"
+        v-if="!['starter'].includes(taskDefinitionKey)"
+        >驳回
+      </el-button>
+
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">
+          更多<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+  </el-col>
+</template>
+
+<script>
+  import { UpdateInformation, cancel } from '@/api/bpm/components/purchasingManage/purchaseNeedManage';
+  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {projectsUpdateAPI} from "@/api/bpm/components/project-manage";
+
+  // 流程实例的详情页,可用于审批
+  export default {
+    name: '',
+    components: {
+      //   Parser
+    },
+    props: {
+      businessId: {
+        default: ''
+      },
+      taskId: {
+        default: ''
+      },
+      id: {
+        default: ''
+      },
+      taskDefinitionKey: {
+        default: ''
+      }
+    },
+    data() {
+      return {
+        form: {
+          reason: ''
+        }
+      };
+    },
+    created() {},
+    methods: {
+      /** 处理转办审批人 */
+      handleUpdateAssignee() {
+        this.$emit('handleUpdateAssignee');
+      },
+      /** 退回 */
+      handleBackList() {
+        this.$emit('handleBackList');
+      },
+
+      async handleAudit(status) {
+        //发起人
+        if (this.taskDefinitionKey === 'starter') {
+          let arr = await this.getTableValue();
+          if (!arr) {
+            return;
+          }
+          let data = await projectsUpdateAPI(arr);
+          if (data.code != '0') {
+            return;
+          }
+        }
+      await  this._approveTaskWithVariables(status);
+      },
+      async _approveTaskWithVariables(status) {
+        let variables = {
+          pass: !!status
+        };
+
+        approveTaskWithVariables({
+          id: this.taskId,
+          reason: this.form.reason,
+          variables
+        }).then((res) => {
+          if (res.data.code != '-1') {
+            this.$emit('handleAudit', {
+              status,
+              title: status === 0 ? '驳回' : ''
+            });
+          }
+        });
+      },
+
+      getTableValue() {
+        return new Promise((resolve, reject) => {
+          this.$emit('getTableValue', async (data) => {
+            resolve(await data);
+          });
+        });
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废?", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
+    }
+  };
+</script>
+
+<style lang="scss"></style>

+ 253 - 0
src/views/bpm/handleTask/components/project-manage/project-initiation/detailDialog.vue

@@ -0,0 +1,253 @@
+<template>
+  <div>
+    <el-form ref="form" :model="form" :rules="rules"  label-width="120px">
+      <headerTitle title="基础信息"></headerTitle>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item
+            prop="type"
+            label="项目类型">
+            <dict-selection dict-name="项目类型" v-model="form.type" :disabled="dialogType=='view'"></dict-selection>
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="code"
+            label="项目编码">
+            <el-input disabled v-model="form.code" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="name"
+            label="项目名称">
+            <el-input v-model="form.name" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="从属项目">
+            <ele-tree-select
+              :disabled="dialogType=='view'"
+              clearable
+              filterable
+              :data="projectList"
+              v-model="form.parentId"
+              childrenKey="projectList"
+              valueKey="id"
+              labelKey="name"
+              placeholder="请选择"
+              default-expand-all
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="responsibleUserId"
+            label="项目经理">
+            <personSelect
+              :disabled="dialogType=='view'"
+              ref="directorRef"
+              v-model="form.responsibleUserId"
+              @selfChange="personChange"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="cycle"
+            label="项目周期">
+            <el-input v-model="form.cycle" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="项目预算">
+            <el-input type="number" :min="0" v-model="form.budget" :disabled="dialogType=='view'">
+              <template slot="append">
+                元
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="planStartDate"
+            label="计划开始日期">
+            <el-date-picker
+              style="width: 100%"
+              :disabled="dialogType=='view'"
+              v-model="form.planStartDate"
+              :picker-options="{disabledDate:(time)=>{return form.planEndDate&&time.getTime()>new Date(form.planEndDate)}}"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="planEndDate"
+            label="计划完成日期">
+            <el-date-picker
+              style="width: 100%"
+              :disabled="dialogType=='view'"
+              :picker-options="{disabledDate:(time)=>{return form.planStartDate&&time.getTime()<new Date(form.planStartDate)}}"
+              v-model="form.planEndDate"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="客户名称">
+            <el-input v-model="form.contactName" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="contactRelationPhone"
+            label="客户联系电话">
+            <el-input v-model="form.contactRelationPhone" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item
+            prop="stage"
+            label="项目阶段">
+            <el-input v-model="form.stage" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="项目优先级">
+            <dict-selection dict-name="项目优先级别" v-model="form.level"
+                            :disabled="dialogType=='view'"></dict-selection>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="项目说明">
+            <el-input type="textarea" :rows="2" v-model="form.content" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input type="textarea" :rows="2" v-model="form.remark" :disabled="dialogType=='view'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+import PersonSelect from "@/components/CommomSelect/person-select.vue";
+import {getByCode} from "@/api/system/dictionary-data";
+import {projectsGetByIdAPI, projectsToTreeAPI} from "@/api/bpm/components/project-manage";
+
+export default {
+  name: "project-form",
+  components: {PersonSelect},
+  props: {
+    dialogType: {
+      type: String,
+      default: 'view',
+    },
+    businessId: {
+      default: ''
+    },
+    taskId: {
+      default: ''
+    },
+    taskDefinitionKey: {
+      default: ''
+    }
+  },
+  data() {
+    return {
+      form: {
+        budget: '',
+        code: "",
+        contactId: '',
+        contactName: "",
+        contactRelationPhone: "",
+        contactRelationUserId: '',
+        contactRelationUserName: "",
+        content: "",
+        cycle: "",
+        deptUserId: '',
+        deptUserName: "",
+        level: "",
+        monitorUserId: '',
+        monitorUserName: "",
+        planStartDate: "",
+        planEndDate: "",
+        name: "",
+        parentId: '',
+        remark: "",
+        responsibleUserId: '',
+        responsibleUserName: "",
+        stage: "",
+        type: '',
+      },
+      projectList: [],
+      rules: {
+        type: {required: true, message: '请选择项目类型', trigger: 'change'},
+        name: {required: true, message: '请输入项目名称', trigger: 'blur'},
+        planStartDate: {required: true, message: '请选择计划开始日期', trigger: 'blur'},
+        planEndDate: {required: true, message: '请选择计划完成日期', trigger: 'blur'},
+      }
+    }
+  },
+  async created() {
+    this.projectList = await projectsToTreeAPI()
+    this.setD(this.form.id, this.form.parentId, () => {
+    })
+    await this.getInfo(this.businessId)
+  },
+
+  methods: {
+    setD(val, parentId, callback) {
+
+    },
+    async getInfo(id) {
+      this.form = await projectsGetByIdAPI(id)
+      this.form.type = this.form.type + ''
+      this.form.level = this.form.level + ''
+      this.form.parentId = this.form.parentId == 0 ? '' : this.form.parentId
+      return this.form
+    },
+
+    personChange(val, info) {
+      this.form.responsibleUserName = info.name;
+    },
+    getTableValue() {
+      return new Promise((resolve, reject) => {
+        this.$refs.form.validate(valid => {
+          if (!valid) {
+            this.$message.warning('有必填项未填,请检查')
+            reject('有必填项未填,请检查')
+          } else {
+            resolve(this.form)
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+
+
+<style scoped lang="scss">
+
+</style>

+ 160 - 0
src/views/bpm/handleTask/components/project-manage/project-initiation/submit.vue

@@ -0,0 +1,160 @@
+<template>
+  <el-col :span="16" :offset="6">
+    <el-form label-width="100px" ref="formRef" :model="form">
+      <el-form-item
+        label="审批建议"
+        prop="reason"
+        style="margin-bottom: 20px"
+        :rules="{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        }"
+      >
+        <el-input
+          type="textarea"
+          v-model="form.reason"
+          placeholder="请输入审批建议"
+        />
+      </el-form-item>
+    </el-form>
+    <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
+      <el-button
+        icon="el-icon-edit-outline"
+        type="success"
+        size="mini"
+        @click="handleAudit(1)"
+        >通过
+      </el-button>
+
+      <el-button
+        icon="el-icon-circle-close"
+        type="danger"
+        size="mini"
+        @click="handleAudit(0)"
+        v-if="!['starter'].includes(taskDefinitionKey)"
+        >驳回
+      </el-button>
+
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">
+          更多<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+  </el-col>
+</template>
+
+<script>
+  import { UpdateInformation, cancel } from '@/api/bpm/components/purchasingManage/purchaseNeedManage';
+  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {projectsUpdateAPI} from "@/api/bpm/components/project-manage";
+
+  // 流程实例的详情页,可用于审批
+  export default {
+    name: '',
+    components: {
+      //   Parser
+    },
+    props: {
+      businessId: {
+        default: ''
+      },
+      taskId: {
+        default: ''
+      },
+      id: {
+        default: ''
+      },
+      taskDefinitionKey: {
+        default: ''
+      }
+    },
+    data() {
+      return {
+        form: {
+          reason: ''
+        }
+      };
+    },
+    created() {},
+    methods: {
+      /** 处理转办审批人 */
+      handleUpdateAssignee() {
+        this.$emit('handleUpdateAssignee');
+      },
+      /** 退回 */
+      handleBackList() {
+        this.$emit('handleBackList');
+      },
+
+      async handleAudit(status) {
+        //发起人
+        if (this.taskDefinitionKey === 'starter') {
+          let arr = await this.getTableValue();
+          if (!arr) {
+            return;
+          }
+          let data = await projectsUpdateAPI(arr);
+          if (data.code != '0') {
+            return;
+          }
+        }
+      await  this._approveTaskWithVariables(status);
+      },
+      async _approveTaskWithVariables(status) {
+        let variables = {
+          pass: !!status
+        };
+
+        approveTaskWithVariables({
+          id: this.taskId,
+          reason: this.form.reason,
+          variables
+        }).then((res) => {
+          if (res.data.code != '-1') {
+            this.$emit('handleAudit', {
+              status,
+              title: status === 0 ? '驳回' : ''
+            });
+          }
+        });
+      },
+
+      getTableValue() {
+        return new Promise((resolve, reject) => {
+          this.$emit('getTableValue', async (data) => {
+            resolve(await data);
+          });
+        });
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废?", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
+    }
+  };
+</script>
+
+<style lang="scss"></style>

+ 4 - 4
src/views/bpm/handleTask/components/saleOrder/returnGoods/addReturnGoodsDialog.vue

@@ -18,7 +18,7 @@
           </el-form-item>
 
           <el-form-item
-            label="退货类型"
+            label="退货方式"
             prop="type"
             style="margin-bottom: 22px"
           >
@@ -52,9 +52,9 @@
               placeholder="请输入"
             />
           </el-form-item>
-          <el-form-item label="赔偿总金额" style="margin-bottom: 22px">
-            {{ totalAmount }}元
-          </el-form-item>
+<!--          <el-form-item label="赔偿总金额" style="margin-bottom: 22px">-->
+<!--            {{ totalAmount }}元-->
+<!--          </el-form-item>-->
         </el-col>
 
         <el-col :span="12">