修改借款管理和品牌项目进度

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -7,7 +7,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
+      <el-col :span="flowDisabled ? 18:24" :xs="24">
         <h2 class="text-center"><b>承接合同评审表</b></h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :disabled="formDisabled">

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -2,18 +2,12 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-19 18:38:28
--->
-<!--
- * @Author: ysh
- * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-19 10:26:51
+ * @LastEditTime: 2024-06-20 10:14:53
 -->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
+      <el-col :span="flowDisabled ? 18:24" :xs="24">
         <h2 class="text-center">分包合同评审表</h2>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :formDisabled="formDisabled">
           <el-divider></el-divider>
@@ -84,7 +78,7 @@
                   :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
                   @input="getContractPath">
                 </FileUpload>
-                <div v-if="formTotal == 1">
+                <div v-if="taskName != '合同拟稿' && form.contractDocument">
                   <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
                     {{ getFileName(form.contractDocument) }}
                   </el-link>

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
     <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
+      <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <h2 class="text-center">借款申请</h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="125px">
@@ -46,17 +46,17 @@
             </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                chooseProject.projectLeaderUser.nickName : ''
-              }}</el-descriptions-item>
+    chooseProject.projectLeaderUser.nickName : ''
+                }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="借款明细">
@@ -102,8 +102,8 @@
                     @change="calculateManagerAmount(detail)"></el-input>
                 </td>
                 <td>
-                  <el-button type="text" style="color:#F56C6C" icon="el-icon-delete" size="mini" circle :disabled="taskName != '借款申请'"
-                    @click="deleDetailItem(index)">删除行</el-button>
+                  <el-button type="text" style="color:#F56C6C" icon="el-icon-delete" size="mini" circle
+                    :disabled="taskName != '借款申请'" @click="deleDetailItem(index)">删除行</el-button>
                 </td>
               </tr>
             </table>
@@ -111,12 +111,12 @@
               :disabled="taskName != '借款申请'"></el-button>
           </el-form-item>
           <el-row :gutter="20">
-            <el-col :span="6" :xs="24">
+            <el-col :span="8" :xs="24">
               <el-form-item label="申请金额" prop="applyAmount">
                 <el-input v-model="form.applyAmount" placeholder="请输入申请金额" :disabled="taskName != '借款申请'" />
               </el-form-item>
             </el-col>
-            <el-col :span="6" :xs="24">
+            <el-col :span="8" :xs="24">
               <el-form-item label="核准金额" prop="managerAmount">
                 <el-input v-model="form.managerAmount" placeholder="请输入核准金额"
                   :disabled="taskName != '分管审核' && taskName != '党工团审核'" />
@@ -146,7 +146,7 @@
           <div v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
             <el-form-item label="部门负责人意见" prop="deptComment">
               <el-input type="textarea" v-model="form.deptComment" placeholder="请输入部门负责人意见"
-                :disabled="taskName != '部门审核'" :autosize="{ minRows: 4}" />
+                :disabled="taskName != '部门审核'" :autosize="{ minRows: 4 }" />
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
@@ -162,7 +162,7 @@
             </el-row>
             <el-form-item label="项目部校核意见" prop="xmComment" v-if="form.borrowUsage == '0'">
               <el-input type="textarea" v-model="form.xmComment" placeholder="请输入项目部校核意见"
-                :disabled="taskName != '项目部审核'" :autosize="{ minRows: 4}" />
+                :disabled="taskName != '项目部审核'" :autosize="{ minRows: 4 }" />
             </el-form-item>
             <el-row v-if="form.borrowUsage == '0'">
               <el-col :span="6" :xs="24" :offset="12">
@@ -178,7 +178,7 @@
             </el-row>
             <el-form-item label="分管领导审核意见" prop="managerComment">
               <el-input type="textarea" v-model="form.managerComment" placeholder="请输入分管领导审核意见"
-                :disabled="taskName != '分管审核'" :autosize="{ minRows: 4}" />
+                :disabled="taskName != '分管审核'" :autosize="{ minRows: 4 }" />
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
@@ -194,7 +194,7 @@
             </el-row>
             <el-form-item label="总经理审批意见" prop="zjlComment">
               <el-input type="textarea" v-model="form.zjlComment" placeholder="请输入总经理审批意见"
-                :disabled="taskName != '总经理审核'" :autosize="{ minRows: 4}" />
+                :disabled="taskName != '总经理审核'" :autosize="{ minRows: 4 }" />
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
@@ -230,8 +230,8 @@
           </div>
           <el-divider></el-divider>
           <el-form-item label="支付凭证" prop="lendDocument">
-            <FileUpload v-if="taskName == '财务处理'" :disabled="taskName != '财务处理'"
-              :limit="1" :filePathName="'借款/支付凭证'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getLendPath">
+            <FileUpload v-if="taskName == '财务处理'" :disabled="taskName != '财务处理'" :limit="1" :filePathName="'借款/支付凭证'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getLendPath">
             </FileUpload>
             <div v-if="form.lendDocument && taskName != '财务处理'">
               <!-- <file-item :document="form.lendDocument"></file-item> -->
@@ -245,7 +245,8 @@
             </div>
           </el-form-item>
           <el-form-item label="财务部支付备注" prop="cwComment">
-            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注" :disabled="taskName != '财务处理'" :autosize="{ minRows: 4}" />
+            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注" :disabled="taskName != '财务处理'"
+              :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -266,7 +267,7 @@
           <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>
-      <el-col :span="6" :xs="24">
+      <el-col :span="6" :xs="24" v-if="flowDisabled">
         <el-card>
           <h2 style="text-align: center;">流程进度</h2>
           <div>
@@ -304,13 +305,21 @@ export default {
   props: {
     taskName: {
       type: String,
-      required: true
     },
     taskForm: {
       type: Object,
       required: true
+    },
+    flowDisabled: {
+      type: Boolean,
+      default: true
     }
   },
+  watch: {
+    'taskForm.formId'() {
+      this.initForm();
+    },
+  },
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
@@ -405,9 +414,10 @@ export default {
     } else {
       this.handleSelectProject(this.form.projectId)
     }
-    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
-      this.flowData = res.data;
-    })
+    if (this.flowDisabled)
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+        this.flowData = res.data;
+      })
   },
   mounted() {
     this.initRules();

oa-ui/src/views/oa/borrow/index.vue

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目id" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="借款人" prop="applier">
         <el-select v-model="queryParams.applier" filterable clearable @change="handleQuery">
@@ -13,12 +18,11 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['oa:borrow:add']">新增</el-button>
       </el-col>
@@ -33,53 +37,33 @@
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:borrow:export']">导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="borrowList" @selection-change="handleSelectionChange">
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="借款类型" align="center" prop="borrowType" />
-      <el-table-column label="借款事由" align="center" prop="applyReason" />
-      <el-table-column label="借款人" align="center" prop="applier" />
-      <el-table-column label="借款日期" align="center" prop="applyDate" width="180">
+      <el-table-column label="借款类型" align="center" prop="borrowUsage">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+          <el-tag :type="setTagType(scope.row.borrowUsage)">
+            {{ setBorrowUsage(scope.row.borrowUsage) }}
+          </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="借款事由" align="center" prop="applyReason" />
       <el-table-column label="申请金额" align="center" prop="applyAmount" />
       <el-table-column label="核准金额" align="center" prop="managerAmount" />
-      <el-table-column label="部门意见" align="center" prop="deptComment" />
-      <!-- <el-table-column label="部门审批人" align="center" prop="deptUserId" />
-      <el-table-column label="项目部审批人" align="center" prop="xmUserId" /> -->
-      <el-table-column label="项目部审批意见" align="center" prop="xmComment" />
-      <el-table-column label="分管审批意见" align="center" prop="managerComment" />
-      <!-- <el-table-column label="分管审批人" align="center" prop="managerUserId" />
-      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" /> -->
-      <!-- <el-table-column label="总经理审批意见" align="center" prop="zjlComment" />
-      <el-table-column label="财务部经办人" align="center" prop="cwUserId" />
-      <el-table-column label="财务部支付备注" align="center" prop="cwComment" />
-      <el-table-column label="部门审批时间" align="center" prop="deptTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="项目部审批时间" align="center" prop="xmTime" width="180">
+      <el-table-column label="借款人" align="center" prop="applier">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.xmTime, '{y}-{m}-{d}') }}</span>
+          {{ getUserName(scope.row.applier) }}
         </template>
       </el-table-column>
-      <el-table-column label="分管审批时间" align="center" prop="managerTime" width="180">
+      <el-table-column label="借款人说明" align="center" prop="remark" />
+      <el-table-column label="借款日期" align="center" prop="applyDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column> -->
       <el-table-column label="借款支付时间" align="center" prop="lendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.lendTime, '{y}-{m}-{d}') }}</span>
@@ -87,10 +71,11 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:borrow:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:borrow:remove']">删除</el-button>
+            v-hasPermi="['oa:borrow:remove']">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -99,97 +84,21 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc借款申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="借款事由" prop="applyReason">
-          <el-input v-model="form.applyReason" placeholder="请输入借款事由" />
-        </el-form-item>
-        <el-form-item label="借款人" prop="applier">
-          <el-input v-model="form.applier" placeholder="请输入借款人" />
-        </el-form-item>
-        <el-form-item label="借款日期" prop="applyDate">
-          <el-date-picker clearable v-model="form.applyDate" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择借款日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="申请金额" prop="applyAmount">
-          <el-input v-model="form.applyAmount" placeholder="请输入申请金额" />
-        </el-form-item>
-        <el-form-item label="核准金额" prop="managerAmount">
-          <el-input v-model="form.managerAmount" placeholder="请输入核准金额" />
-        </el-form-item>
-        <el-form-item label="部门意见" prop="deptComment">
-          <el-input v-model="form.deptComment" placeholder="请输入部门意见" />
-        </el-form-item>
-        <el-form-item label="部门审批人" prop="deptUserId">
-          <el-input v-model="form.deptUserId" placeholder="请输入部门审批人" />
-        </el-form-item>
-        <el-form-item label="项目部审批人" prop="xmUserId">
-          <el-input v-model="form.xmUserId" placeholder="请输入项目部审批人" />
-        </el-form-item>
-        <el-form-item label="项目部审批意见" prop="xmComment">
-          <el-input v-model="form.xmComment" placeholder="请输入项目部审批意见" />
-        </el-form-item>
-        <el-form-item label="分管审批意见" prop="managerComment">
-          <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
-        </el-form-item>
-        <el-form-item label="分管审批人" prop="managerUserId">
-          <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
-        </el-form-item>
-        <el-form-item label="总经理审批人" prop="zjlUserId">
-          <el-input v-model="form.zjlUserId" placeholder="请输入总经理审批人" />
-        </el-form-item>
-        <el-form-item label="总经理审批意见" prop="zjlComment">
-          <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" />
-        </el-form-item>
-        <el-form-item label="财务部经办人" prop="cwUserId">
-          <el-input v-model="form.cwUserId" placeholder="请输入财务部经办人" />
-        </el-form-item>
-        <el-form-item label="财务部支付备注" prop="cwComment">
-          <el-input v-model="form.cwComment" placeholder="请输入财务部支付备注" />
-        </el-form-item>
-        <el-form-item label="部门审批时间" prop="deptTime">
-          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择部门审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="项目部审批时间" prop="xmTime">
-          <el-date-picker clearable v-model="form.xmTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择项目部审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="分管审批时间" prop="managerTime">
-          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择分管审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="总经理审批时间" prop="zjlTime">
-          <el-date-picker clearable v-model="form.zjlTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择总经理审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="借款支付时间" prop="lendTime">
-          <el-date-picker clearable v-model="form.lendTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择借款支付时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="open" width="64%" append-to-body>
+      <borrow-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></borrow-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
-
+import { listProject } from '@/api/oa/project/project';
+import BorrowForm from '../../flowable/form/finance/borrowForm.vue';
 export default {
   name: "Borrow",
+  components: {
+    BorrowForm
+  },
   data() {
     return {
       // 遮罩层
@@ -241,6 +150,11 @@ export default {
       form: {},
       // 表单校验
       rules: {
+      },
+      projectList: [],
+      taskForm: {
+        formId: '',
+        procDefName:'借款审批'
       }
     };
   },
@@ -257,6 +171,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -323,6 +246,10 @@ export default {
         this.title = "修改cmc借款申请";
       });
     },
+    handleView(row) {
+      this.open = true;
+      this.taskForm.formId = row.borrowId
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -358,6 +285,32 @@ export default {
       this.download('oa/borrow/export', {
         ...this.queryParams
       }, `borrow_${new Date().getTime()}.xlsx`)
+    },
+    setBorrowUsage(row) {
+      if (row == '0') {
+        return '项目借款'
+      } else if (row == '1') {
+        return '非项目借款'
+      } else if (row == '2') {
+        return '工会借款'
+      } else if (row == '3') {
+        return '党委借款'
+      } else if (row == '4') {
+        return '团委借款'
+      }
+    },
+    setTagType(row) {
+      if (row == '0') {
+        return 'success'
+      } else if (row == '1') {
+        return 'warning'
+      } else if (row == '2') {
+        return ''
+      } else if (row == '3') {
+        return ''
+      } else if (row == '14') {
+        return ''
+      }
     }
   }
 };

oa-ui/src/views/oa/brand/brandProject.vue

@@ -2,7 +2,8 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="项目编号" prop="projectNumber">
-        <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
         <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
@@ -35,18 +36,27 @@
 
     <el-table v-loading="loading" :data="brandProjectList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目进度" align="center">
+        <template slot-scope="scope">
+          <el-progress :text-inside="true" :stroke-width="26" :status="formartProjectProgress(scope.row.percentage)"
+            :percentage="scope.row.percentage" text-color="#fff"></el-progress>
+        </template>
+      </el-table-column>
+      <el-table-column label="收款进度" align="center">
+        <template slot-scope="scope"></template>
+      </el-table-column>
       <el-table-column label="项目编号" align="center" prop="projectNumber" />
-      <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" />
-      <el-table-column label="甲方单位联系人" align="center" prop="aPerson" />
-      <el-table-column label="甲方单位联系电话" align="center" prop="aPhone" />
+      <el-table-column label="项目名称" align="center" prop="projectName" width="200px" />
+      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="200px" />
+      <!-- <el-table-column label="甲方单位联系人" align="center" prop="aPerson" />
+      <el-table-column label="甲方单位联系电话" align="center" prop="aPhone" /> -->
       <el-table-column label="合作单位" align="center" prop="partner.partnerName" />
-      <el-table-column label="合作单位联系人" align="center" prop="contactPerson" />
-      <el-table-column label="合作单位联系电话" align="center" prop="telephone" />
+      <!-- <el-table-column label="合作单位联系人" align="center" prop="contactPerson" />
+      <el-table-column label="合作单位联系电话" align="center" prop="telephone" /> -->
       <el-table-column label="项目工期" align="center" prop="duration" />
       <el-table-column label="合同金额" align="center" prop="amount" />
-      <el-table-column label="项目概况" align="center" prop="content" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <!-- <el-table-column label="项目概况" align="center" prop="content" /> -->
+      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -85,7 +95,8 @@
               甲方单位
             </template>
             <el-form-item prop="partyAId">
-              <el-select allow-create v-model="form.partyAId" filterable placeholder="请选择" style="width: 100%;" clearable>
+              <el-select allow-create v-model="form.partyAId" filterable placeholder="请选择" style="width: 100%;"
+                clearable>
                 <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
                 </el-option>
               </el-select>
@@ -112,8 +123,8 @@
               合作单位
             </template>
             <el-form-item prop="partnerId">
-              <el-select allow-create v-model="form.partnerId" filterable placeholder="请选择" style="width: 100%;" clearable
-                @change="handleSelectPartner">
+              <el-select allow-create v-model="form.partnerId" filterable placeholder="请选择" style="width: 100%;"
+                clearable @change="handleSelectPartner">
                 <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                   :value="item.partnerId">
                 </el-option>
@@ -171,7 +182,7 @@
         </el-descriptions>
         <el-divider></el-divider>
         <el-form-item label="项目进度：">
-          <table border="1">
+          <table border="1" style="width:100%">
             <tr>
               <td style="width: 80px">序号</td>
               <td>截至日期</td>
@@ -188,7 +199,8 @@
                   value-format="yyyy-MM-dd"></el-date-picker>
               </td>
               <td>
-                <el-input-number v-model="progress.percentage" :controls="false" style="width: 120px"></el-input-number>%
+                <el-input-number v-model="progress.percentage" :controls="false"
+                  style="width: 120px"></el-input-number>%
               </td>
               <td>
                 <el-input v-model="progress.situation" type="textarea"></el-input>
@@ -212,6 +224,7 @@
 
 <script>
 import { listBrandProject, getBrandProject, delBrandProject, addBrandProject, updateBrandProject } from "@/api/oa/brand/brandProject";
+import { listBrandProgress, getBrandProgress, addBrandProgress, delBrandProgress } from "@/api/oa/brand/brandProgress"
 import { listPartner, getPartner } from "@/api/oa/partner/partner";
 import { listPartyA } from "@/api/oa/partyA/partyA";
 
@@ -285,6 +298,24 @@ export default {
         this.brandProjectList = response.rows;
         this.total = response.total;
         this.loading = false;
+        this.brandProjectList.forEach(item => {
+          listBrandProgress({
+            pageNum: 1,
+            pageSize: 200,
+            projectId: item.projectId
+          }).then(res => {
+            debugger
+            if (res.rows) {
+              let len = res.rows.length
+              if (len != 0) {
+                this.$set(item, 'percentage', Number(res.rows[len - 1].percentage))
+              } else {
+                this.$set(item, 'percentage', 0)
+              }
+            }
+
+          })
+        })
       });
     },
     // 取消按钮
@@ -375,6 +406,11 @@ export default {
       this.reset();
       this.open = true;
       this.title = "品牌项目登记";
+      this.progressList = [{
+        date: "",
+        percentage: "",
+        situation: "",
+      }]
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -385,6 +421,21 @@ export default {
         this.open = true;
         this.title = "品牌项目修改";
       });
+      listBrandProgress({
+        pageNum: 1,
+        pageSize: 200,
+        projectId: projectId
+      }).then(res => {
+        if (res.rows && res.rows.length != 0) {
+          this.progressList = res.rows
+        } else {
+          this.progressList = [{
+            date: "",
+            percentage: "",
+            situation: "",
+          }]
+        }
+      })
     },
     /** 提交按钮 */
     submitForm() {
@@ -395,6 +446,7 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.updateProjectProgressList();
             });
           } else {
             addBrandProject(this.form).then(response => {
@@ -402,10 +454,38 @@ export default {
               this.open = false;
               this.getList();
             });
+            this.addProjectProgressList();
           }
         }
       });
     },
+    addProjectProgressList() {
+      const projectId = this.form.projectId
+      this.progressList.forEach(progress => {
+        progress.projectId = projectId;
+        addBrandProgress(progress)
+      })
+    },
+    updateProjectProgressList() {
+      const projectId = this.form.projectId
+      delBrandProgress(projectId).then(
+        this.addProjectProgressList()
+      )
+    },
+    getProjectProgressList() {
+
+    },
+    formartProjectProgress(row) {
+      if (row <= 20) {
+        return 'exception'
+      } else if (row > 20 && row <= 50) {
+        return 'warning'
+      } else if (row > 50 && row <= 80) {
+        return ''
+      } else {
+        return 'success'
+      }
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const projectIds = row.projectId || this.ids;
@@ -443,4 +523,15 @@ table {
   font-weight: bold;
   display: inline-block;
 }
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #5a5757;
+  background: rgba($color: #a9adb3, $alpha: 0.1);
+  width: 150px;
+  min-width: 150px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #cdd0d3;
+}
 </style>