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

src/store/modules/user.js

@@ -14,7 +14,9 @@ const user = {
     deptId: '',
     deptName: '',
     orgId: '',
-    orgName: ''
+    orgName: '',
+    adminDept: '',
+    adminDeptName: ''
   },
 
   mutations: {
@@ -51,6 +53,12 @@ const user = {
     ORGNAME: (state, orgName) => {
       state.orgName = orgName
     },
+    ADMINDEPT: (state, adminDept) => {
+      state.adminDept = adminDept
+    },
+    ADMINDEPTNAME: (state, adminDeptName) => {
+      state.adminDeptName = adminDeptName
+    },
   },
 
   actions: {
@@ -75,7 +83,9 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
+          console.log("res",res);
           const user = res.user
+          console.log("user",user);
           const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
@@ -92,6 +102,8 @@ const user = {
           commit('DEPTNAME', user.deptName)
           commit('ORGID', user.orgId)
           commit('ORGNAME', user.orgName)
+          commit('ADMINDEPT', user.adminDept)
+          commit('ADMINDEPTNAME', user.adminDeptName)
           resolve(res)
         }).catch(error => {
           reject(error)

src/views/business/spd/bo/basic/behaviorList.vue

@@ -453,8 +453,8 @@ export default {
       this.form.type = '0';
       this.form.staff = this.$store.state.user.id;
       this.form.staffName = this.$store.state.user.nickName;
-      this.form.dept = this.$store.state.user.deptId;
-      this.form.deptName = this.$store.state.user.deptName;
+      this.form.dept = this.$store.state.user.adminDept;
+      this.form.deptName = this.$store.state.user.adminDeptName;
       this.form.salesOrg = this.$store.state.user.orgId;
       this.form.salesOrgName = this.$store.state.user.orgName;
       this.form.time = new Date();

src/views/business/spd/bo/basic/bobehaviorList.vue

@@ -11,16 +11,8 @@
     </div>
     <el-table size="mini" v-loading="loading" :data="behaviorList">
       <el-table-column label="序号" align="center" type="index" width="50" fixed/>
-      <el-table-column label="负责人" align="center" prop="staffName" />
-      <el-table-column label="行动日期" align="center" prop="time" />
-      <el-form-item label="行动日期" prop="time">
-        <el-date-picker clearable
-          v-model="form.time"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择行动日期">
-        </el-date-picker>
-      </el-form-item>
+      <el-table-column label="跟进人" align="center" prop="createByName" />
+      <el-table-column label="跟进日期" align="center" prop="time" />
       <el-table-column label="联系人" align="center" prop="linkmanName" />
       <el-table-column label="拜访效果" align="center" prop="result" >
         <template slot-scope="scope">
@@ -155,35 +147,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="销售区域" prop="marketingAreaName">
-              <dr-popover-select v-model="form.marketingAreaName" title="销售区域" type="MK_SALESAREA_PARAM" :dataMapping="{
-                  marketingArea: 'id',
-                  marketingAreaName: 'name',
-                }" :source.sync="form"
-              >
-              </dr-popover-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col  :span="8">
-            <el-form-item label="销售组织" prop="salesOrgName">
-              <el-input v-model="form.salesOrgName" readonly/>
-            </el-form-item>
-          </el-col>
-          <el-col  :span="8">
-             <el-form-item label="部门" prop="deptName">
-              <el-input v-model="form.deptName" readonly/>
-            </el-form-item>
-          </el-col>
-          <el-col  :span="8">
-            <el-form-item label="负责人" prop="staffName">
-              <el-input v-model="form.staffName" readonly/>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-divider content-position="left">
           <dev style="width: 50px; height: 40px; font-size: 18px">跟进内容</dev>
         </el-divider>
@@ -221,25 +184,21 @@
             <dev style="width: 50px; height: 40px; font-size: 18px">其它信息</dev>
           </el-divider>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
+              <el-form-item label="部门" prop="deptName">
+                <el-input v-model="form.deptName" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-form-item label="创建人">
                 <el-input v-model="form.createByName" readonly></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="创建时间">
                 <el-input v-model="form.createTime" readonly></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="修改人">
-                <el-input v-model="form.updateByName" readonly></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="修改时间">
-                <el-input v-model="form.updateTime" readonly></el-input>
-              </el-form-item>
             </el-col>
           </el-row>
         </div>
@@ -253,15 +212,13 @@
 </template>
 
 <script>
-import { listBehavior, getBehavior, addBehavior, updateBehavior } from "@/api/business/spd/bo/behavior";
-import ContactRef from '@/views/business/spd/bo/refer/contact/index.vue';
-import SaleaeaRef from '@/views/business/spd/bo/refer/saleaea/index.vue';
+import {getBehavior, addBehavior, updateBehavior } from "@/api/business/spd/bo/behavior";
+import {listBehavior} from "@/api/business/spd/bo/basic";
 
 export default {
   name: "bobehaviorList",
   props:["bo","boAuthority"],
   dicts: ['mk_bo_behavior_res','mk_bo_behavior_type','sys_yes_no','mk_bo_behavior_goal'],
-  components: {ContactRef,SaleaeaRef},
   data() {
     return {
       dialogImageUrl: '',
@@ -332,7 +289,7 @@ export default {
   },
   created() {
     //组件创建时初始化查询参数
-    this.queryParams.bo = this.bo.id;
+    this.queryParams.id = this.bo.id;
     let params = {"post":this.boAuthority.post};
     this.queryParams.params = params;
     //查询
@@ -416,14 +373,9 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
     /** 新增按钮操作 */
     handleAdd() {
+      console.log("this.$store.state.user",this.$store.state.user);
       this.fileList = [];
       this.reset();
       this.operatingState = "Insert";
@@ -435,10 +387,13 @@ export default {
       this.form.type = '0';
       this.form.staff = this.$store.state.user.id;
       this.form.staffName = this.$store.state.user.nickName;
-      this.form.dept = this.$store.state.user.deptId;
-      this.form.deptName = this.$store.state.user.deptName;
+      this.form.dept = this.$store.state.user.adminDept;
+      this.form.deptName = this.$store.state.user.adminDeptName;
       this.form.salesOrg = this.$store.state.user.orgId;
       this.form.salesOrgName = this.$store.state.user.orgName;
+      this.form.createBy = this.$store.state.user.name;
+      this.form.createByName = this.$store.state.user.nickName;
+      this.form.createTime = new Date().Format("yyyy-MM-dd HH:mm:ss");
       this.form.time = new Date();
       this.open = true;
       this.title = "商机跟进";
@@ -446,7 +401,7 @@ export default {
     /** 查看按钮操作 */
     handleBrowse(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id;
       getBehavior(id).then(response => {
         this.form = response.data;
         this.fileList = this.form.behaviorPs;

src/views/business/spd/bo/basic/details.vue

@@ -60,22 +60,34 @@
       <el-descriptions-item label="赢单率">
         {{ form.basic.winningRate }}
       </el-descriptions-item>
-      <el-descriptions-item label="商机状态:" style="margin-left:27px">
-        <div v-for="dict in dict.type.mk_bo_state" v-if="form.basic.boState == dict.value">
-          <div>{{ dict.label }}</div>
-        </div>
-      </el-descriptions-item>
-      <el-descriptions-item label="赢丢单状态:">
+      <el-descriptions-item label="赢丢单状态">
         <div v-for="dict in dict.type.mk_bo_winstate" v-if="form.basic.winningState == dict.value">
           {{ dict.label }}
         </div>
       </el-descriptions-item>
+      <el-descriptions-item label="最近跟进">
+        {{form.basic.recentlyFollowup ? form.basic.recentlyFollowup : "暂无跟进"}}
+      </el-descriptions-item>
     </el-descriptions>
     <el-descriptions :column="1">
       <el-descriptions-item label="商机内容">
         {{ form.basic.boContent }}
       </el-descriptions-item>
     </el-descriptions>
+    <el-descriptions :column="4" v-if="form.basic.winningState != '0'">
+      <el-descriptions-item :label="winningStateTitle + '原因'">
+        {{ form.basic.winningStateCause }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="winningStateTitle + '备注'">
+        {{ form.basic.winningStateRemark }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="winningStateTitle + '日期'">
+        {{new Date(form.basic.winningStateDate).Format("yyyy-MM-dd")}}
+      </el-descriptions-item>
+      <el-descriptions-item :label="winningStateTitle + '金额'">
+        {{ form.basic.winningStateMoney }}
+      </el-descriptions-item>
+    </el-descriptions>
     <!-- 主多页签 -->
     <el-tabs v-model="masterTabs" @tab-click="tabsSwitch">
       <!-- 项目流程页签 -->
@@ -215,7 +227,7 @@ import {
 } from "@/api/business/spd/bo/basic";
 import { getBoNodeListByType } from "@/api/business/spd/bo/boNode";
 import { getPsnPost } from "@/api/business/spd/bo/authority";
-import TaskList from "./taskList.vue";
+import TaskList from "./botaskList.vue";
 import ContactList from "./bocontactList.vue";
 import AccessoryList from "../basic/accessoryList.vue";
 import FileTemplate from "../filetemplate/botabs.vue";
@@ -303,7 +315,7 @@ export default {
       //营收总额
       totalRevenue: "***营收总额",
       //预估额
-      estimate: "***预估额（万元）",
+      estimate: "***预估额（万元）"
     };
   },
   watch: {
@@ -456,7 +468,7 @@ export default {
           this.showClose = false;
           this.showLose = false;
           this.showWin = false;
-          if (curNode < auditNode) {
+          if (curNode != auditNode) {
             this.showClose = true;
           }
           if (curNode > auditNode) {
@@ -480,6 +492,12 @@ export default {
     //加载基础数据
     getBasic(this.$route.params.id).then((response) => {
       this.form.basic = response.data;
+      //设置应丢关单标题
+      switch(this.form.basic.winningState){
+        case "1" : this.winningStateTitle = "关闭";break;
+        case "2" : this.winningStateTitle = "丢单";break;
+        case "3" : this.winningStateTitle = "赢单";break;
+      }
       //加载权限数据
       getPsnPost(this.form.basic.id).then((response) => {
         this.boAuthority = response.data;
@@ -506,7 +524,7 @@ export default {
         this.showClose = false;
         this.showLose = false;
         this.showWin = false;
-        if (curNode < auditNode) {
+        if (curNode != auditNode) {
           this.showClose = true;
         }
         if (curNode > auditNode) {

src/views/business/spd/bo/basic/index.vue

@@ -117,9 +117,7 @@
     <el-table
       v-loading="loading"
       :data="basicList"
-      @selection-change="handleSelectionChange"
       @cell-dblclick="enterDetails"
-      :height="height"
       size="mini"
     >
       <el-table-column
@@ -134,19 +132,12 @@
           <dict-tag :options="dict.type.mk_bo_type" :value="scope.row.boType" />
         </template>
       </el-table-column>
-      <el-table-column label="商机状态" width="150" align="center" prop="boState">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.mk_bo_state"
-            :value="scope.row.boState"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="商机来源" width="150" align="center" prop="boSource">
+      <el-table-column label="赢单率" width="150" align="center" prop="winningRate" />
+      <el-table-column label="赢单率状态" width="150" align="center" prop="winningState">
         <template slot-scope="scope">
           <dict-tag
-            :options="dict.type.mk_bo_source"
-            :value="scope.row.boSource"
+            :options="dict.type.mk_bo_winstate"
+            :value="scope.row.winningState"
           />
         </template>
       </el-table-column>
@@ -158,31 +149,17 @@
         align="center"
         prop="hosDiscreetValue"
       />
-      <el-table-column label="赢单率" width="150" align="center" prop="winningRate" />
-      <el-table-column label="赢单率状态" width="150" align="center" prop="winningState">
+      <el-table-column label="商机来源" width="150" align="center" prop="boSource">
         <template slot-scope="scope">
           <dict-tag
-            :options="dict.type.mk_bo_winstate"
-            :value="scope.row.winningState"
+            :options="dict.type.mk_bo_source"
+            :value="scope.row.boSource"
           />
         </template>
       </el-table-column>
-      <el-table-column
-        width="150"
-        label="销售区域"
-        align="center"
-        prop="marketingAreaName"
-      />
-      <el-table-column
-        width="150"
-        show-overflow-tooltip
-        label="销售组织"
-        align="center"
-        prop="marketingOrganizingName"
-      />
-      <el-table-column label="部门" width="150" align="center" prop="deptName" />
+      <el-table-column show-overflow-tooltip label="部门" width="150" align="center" prop="deptName" />
       <el-table-column label="商机负责人" width="150" align="center" prop="principalName" />
-      <el-table-column label="创建人" width="150" align="center" prop="createBy" />
+      <el-table-column label="创建人" width="150" align="center" prop="createByName" />
       <el-table-column label="创建时间" width="150" align="center" prop="createTime" />
       <el-table-column
         label="操作"
@@ -230,6 +207,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      class="paginationClass"
     />
 
     <!-- 添加或修改商机基础信息对话框 -->
@@ -275,21 +253,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              label="推荐人"
-              prop="referrerName"
-              v-show="form.boSource == '2'"
-              :rules="
-                form.boSource == '2' ? rules.referrer : [{ require: false }]
-              "
-            >
-              <el-input v-model="form.referrerName">
-                <el-button
-                  slot="append"
-                  icon="el-icon-more"
-                  @click="refereStaff"
-                ></el-button>
-              </el-input>
+            <el-form-item label="推荐人" prop="referrerName" v-show="form.boSource == '2'" :rules="form.boSource == '2' ? rules.referrer : [{ require: false }]">
+              <dr-popover-select 
+                  :disabled="this.operatingState == 'Update'"
+                  v-model="form.referrerName" title="推荐人" type="CONTACTS_PARAM" :dataMapping="{
+                  referrer: 'id',
+                  referrerName: 'name',
+                }" :source.sync="form">
+              </dr-popover-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -318,17 +289,6 @@
                   customerName: 'name',
                 }" :source.sync="form">
               </dr-popover-select>
-              <!-- <el-input
-                v-model="form.customerName"
-                :disabled="this.operatingState == 'Update'"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-more"
-                  @click="refereCustomer"
-                  :disabled="this.operatingState == 'Update'"
-                ></el-button>
-              </el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -383,15 +343,7 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="销售区域" prop="marketingAreaName">
-              <el-input
-                v-model="form.marketingAreaName"
-                placeholder="请输入销售区域"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-more"
-                  @click="refereSaleaea"
-                ></el-button>
+              <el-input v-model="form.marketingAreaName" readonly>
               </el-input>
             </el-form-item>
           </el-col>
@@ -427,33 +379,6 @@
         <el-button size="mini" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-    <!-- 客户参照 -->
-    <CustomerRef
-      ref="customerSelect"
-      @doSubmit="customerSelectionsToInput"
-      :single="true"
-    />
-    <!-- 销售区域参照 -->
-    <SaleaeaRef
-      ref="saleaeaSelect"
-      @doSubmit="saleaeaSelectionsToInput"
-      :single="true"
-    />
-    <!-- 组织参照 -->
-    <OrgRef ref="orgSelect" @doSubmit="orgSelectionsToInput" :single="true" />
-    <!-- 部门参照 -->
-    <DeptRef
-      ref="deptSelect"
-      @doSubmit="deptSelectionsToInput"
-      :single="true"
-    />
-    <!-- 员工参照 -->
-    <StaffRef
-      ref="staffSelect"
-      @doSubmit="staffSelectionsToInput"
-      :single="true"
-    />
   </div>
 </template>
 
@@ -615,8 +540,6 @@ export default {
           }
         }]
       },
-      //表格高度
-      height: "200px",
     };
   },
   watch: {
@@ -657,7 +580,6 @@ export default {
     }
   },
   created() {
-    this.height = window.innerHeight - 250 + 'px';
     this.getList();
   },
   methods: {
@@ -746,22 +668,17 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
       this.operatingState = "Insert";
-      const { id, name, orgId, deptId, nickName, deptName, orgName } = this.$store.state.user;
+      console.log("this.$store.state.user",this.$store.state.user);
+      const { id, name, orgId, adminDept, nickName, adminDeptName, orgName } = this.$store.state.user;
       this.form.principal = name;
       this.form.principalName = nickName;
-      this.form.dept = deptId;
-      this.form.deptName = deptName;
+      this.form.dept = adminDept;
+      this.form.deptName = adminDeptName;
       this.form.marketingOrganizing = orgId;
       this.form.marketingOrganizingName = orgName;
       this.title = "添加商机基础信息";
@@ -831,16 +748,6 @@ export default {
         })
         .catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        "system/basic/export",
-        {
-          ...this.queryParams,
-        },
-        `basic_${new Date().getTime()}.xlsx`
-      );
-    },
     //选择医院营收总额后
     totalHosRevenueChange(value) {
       switch (value) {
@@ -880,52 +787,6 @@ export default {
         this.mk_bo_stage = [];
       }
     },
-    // 触发客户参照列表
-    refereCustomer() {
-      this.$refs.customerSelect.init();
-    },
-    //客户参照列表选择后
-    customerSelectionsToInput(selections) {
-      this.form.customer = selections[0].id;
-      this.form.customerName = selections[0].name;
-    },
-    // 触发销售区域参照列表
-    refereSaleaea() {
-      this.$refs.saleaeaSelect.init();
-    },
-    //销售区域参照列表选择后
-    saleaeaSelectionsToInput(selections) {
-      this.form.marketingArea = selections[0].id;
-      this.form.marketingAreaName = selections[0].name;
-    },
-    // 触发组织参照列表
-    refereOrg() {
-      this.$refs.orgSelect.init();
-    },
-    //组织参照列表选择后
-    orgSelectionsToInput(selections) {
-      this.form.marketingOrganizing = selections[0].deptId;
-      this.form.marketingOrganizingName = selections[0].deptName;
-    },
-    // 触发部门参照列表
-    refereDept() {
-      this.$refs.deptSelect.init();
-    },
-    //部门参照列表选择后
-    deptSelectionsToInput(selections) {
-      this.form.dept = selections[0].deptId;
-      this.form.deptName = selections[0].deptName;
-    },
-    // 触发员工参照列表
-    refereStaff() {
-      this.$refs.staffSelect.init();
-    },
-    //员工参照列表选择后
-    staffSelectionsToInput(selections) {
-      this.form.referrer = selections[0].userId;
-      this.form.referrerName = selections[0].nickName;
-      console.log("this.form", this.form);
-    },
   },
 };
 </script>
@@ -945,8 +806,13 @@ export default {
 .lines {
   margin-top: 0;
 }
-.el-pagination {
-  margin-top: 10px;
-  text-align: right;
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
 }
 </style>

src/views/business/spd/bo/basic/taskList.vue

@@ -1,639 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="btn_grooup" v-if="bo.winningState == 0 && '0-1'.includes(boAuthority.post)">
-      <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          >新增</el-button>
-    </div>
-    <el-table size="mini" v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
-      <el-table-column label="序号" type="index" width="50" align="center" fixed/>
-      <el-table-column label="商机阶段" align="center" prop="boStageName"/>
-      <el-table-column width="150" show-overflow-tooltip label="任务编码" align="center" prop="code" />
-      <el-table-column width="200" show-overflow-tooltip label="任务名称" align="center" prop="name" />
-      <el-table-column label="任务类型" align="center" prop="type">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.mk_bo_tasktype"
-            :value="scope.row.type"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="任务状态" align="center" prop="state">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.mk_bo_taskstate"
-            :value="scope.row.state"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="联系人" align="center" prop="linkmanName" />
-      <el-table-column
-        width="200" 
-        show-overflow-tooltip
-        label="销售组织名称"
-        align="center"
-        prop="salesOrgName"
-      />
-      <el-table-column width="200" show-overflow-tooltip label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="负责人名称" align="center" prop="staffName" />
-      <el-table-column
-        label="截止时间"
-        align="center"
-        prop="deadlineTime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.deadlineTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column width="200" show-overflow-tooltip label="任务内容" align="center" prop="content" />
-      <el-table-column
-        width="250"
-        label="操作"
-        fixed="right"
-        align="center"
-        class-name="small-padding fixed-width"
-        v-if="bo.winningState == 0 ? true : false"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-search"
-            @click="handleBrowse(scope.row)"
-            >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-top"
-            @click="submitTask(scope.row)"
-            v-if="scope.row.state == 0 && '0-1'.includes(boAuthority.post) && scope.row.createBy == $store.state.user.name"
-            >提交</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-if="scope.row.state == 0 && '0-1'.includes(boAuthority.post) && scope.row.createBy == $store.state.user.name"
-            >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-if="scope.row.state == 0 && '0-1'.includes(boAuthority.post) && scope.row.createBy == $store.state.user.name"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改任务对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        size="mini"
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :disabled="operatingState == 'Browse'"
-      >
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="商机名称" prop="boName">
-              <el-input
-                v-model="form.boName"
-                readonly
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="商机阶段" prop="boStage">
-              <el-input v-model="form.boStage" readonly/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="客户" prop="customerName">
-              <el-input
-                v-model="form.customerName"
-                readonly
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="任务编码" prop="code">
-              <el-input
-                v-model="form.code"
-                placeholder="系统自动生成编码"
-                readonly
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="任务名称" prop="name">
-              <el-input v-model="form.name" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="任务状态" prop="state">
-              <el-select v-model="form.state" placeholder="请输入任务状态">
-                <el-option
-                  v-for="dict in dict.type.mk_bo_taskstate"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="开始时间" prop="startTime">
-              <el-date-picker
-                clearable
-                v-model="form.startTime"
-                type="date"
-                value-format="yyyy-MM-dd"
-                :picker-options="editStartOptions"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="截止时间" prop="deadlineTime">
-              <el-date-picker
-                clearable
-                v-model="form.deadlineTime"
-                type="date"
-                value-format="yyyy-MM-dd"
-                :picker-options="editStopOptions"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="任务类型" prop="type">
-              <el-select v-model="form.type" placeholder="">
-                <el-option
-                  v-for="dict in dict.type.mk_bo_tasktype"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="联系人" prop="linkmanName">
-              <dr-popover-select
-                v-model="form.linkmanName"
-                title="联系人选择"
-                type="LINKMAN_PARAM"
-                :dataMapping="{
-                  linkman: 'id',
-                  linkmanName: 'name',
-                }"
-                :source.sync="form"
-                :queryParams="additionalCondition"
-              >
-              </dr-popover-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="销售组织" prop="salesOrgName">
-              <el-input
-                v-model="form.salesOrgName"
-                readonly
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="部门" prop="deptName">
-              <el-input
-                v-model="form.deptName"
-                readonly
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="负责人" prop="staffName">
-              <el-input v-model="form.staffName">
-                <el-button
-                  slot="append"
-                  icon="el-icon-more"
-                  @click="refereStaff"
-                ></el-button>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="任务内容" prop="content">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入任务内容"
-            autosize
-            v-model="form.content"
-          >
-          </el-input>
-        </el-form-item>
-        <el-divider content-position="left">其它信息</el-divider>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input
-                v-model="form.createByName"
-                readonly
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间">
-              <el-input
-                v-model="form.createTime"
-                readonly
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="修改人">
-              <el-input
-                v-model="form.updateByName"
-                readonly
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="修改时间">
-              <el-input
-                v-model="form.updateTime"
-                readonly
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <BehaviorList
-          :key="timer"
-          :source="'TASK'"
-          :task="form"
-          v-if="operatingState == 'Browse'"
-        />
-        
-      <div slot="footer">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="submitForm"
-          v-if="operatingState != 'Browse'"
-          :disabled="submitButtonEditStatus"
-          >确 定</el-button
-        >
-        <el-button size="mini" @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 员工参照 -->
-    <StaffRef
-      ref="staffSelect"
-      @doSubmit="staffSelectionsToInput"
-      :single="true"
-    />
-  </div>
-</template>
-
-<script>
-import {
-  getTask,
-  delTask,
-  addTask,
-  updateTask,
-  submit
-} from "@/api/business/spd/bo/task";
-import {listTask} from "@/api/business/spd/bo/basic";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import StaffRef from "@/views/business/spd/bo/refer/staff/index.vue";
-import BehaviorList from "./behaviorList.vue";
-
-export default {
-  name: "TaskList",
-  props: ["bo", "boAuthority"],
-  dicts: ["mk_bo_taskstate", "mk_bo_tasktype", "mk_bo_stage"],
-  components: {
-    StaffRef,
-    BehaviorList,
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 任务表格数据
-      taskList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        bo: null,
-        boStage: null,
-        code: null,
-        name: null,
-        type: null,
-        state: null,
-        customer: null,
-        customerName: null,
-        linkman: null,
-        linkmanName: null,
-        salesOrg: null,
-        salesOrgName: null,
-        dept: null,
-        deptName: null,
-        staff: null,
-        staffName: null,
-        startTime: null,
-        deadlineTime: null,
-        content: null,
-        tenantId: null,
-        revision: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        customerName: [
-          { required: true, message: "客户不能为空", trigger: "blur" },
-        ],
-        name: [
-          { required: true, message: "任务名称不能为空", trigger: "blur" },
-        ],
-        state: [
-          { required: true, message: "任务状态不能为空", trigger: "blur" },
-        ],
-        type: [
-          { required: true, message: "任务类型不能为空", trigger: "blur" },
-        ],
-        linkmanName: [
-          { required: true, message: "联系人不能为空", trigger: "blur" },
-        ],
-        staffName: [
-          { required: true, message: "负责人不能为空", trigger: "blur" },
-        ],
-        startTime: [
-          { required: true, message: "开始时间不能为空", trigger: ["blur", "change"] },
-        ],
-        deadlineTime: [
-          { required: true, message: "截止时间不能为空", trigger: ["blur", "change"] },
-        ],
-        content: [
-          { required: true, message: "任务内容不能为空", trigger: "blur" },
-        ],
-      },
-      //重新加载子组件参数
-      timer: "",
-      //当前操作状态
-      operatingState: "",
-      editStartOptions: {
-        disabledDate: time => {
-          if (!this.form.deadlineTime) {
-            return time.getTime() < new Date(1970 - 1 - 1).getTime();   //禁止选择1970年以前的日期
-          } else {
-            return time.getTime() > new Date(this.form.deadlineTime);
-          }
-        }
-      },
-      editStopOptions: {
-        disabledDate: time => {
-          return (
-            time.getTime() < new Date(this.form.startTime) ||
-            time.getTime() < new Date(1970 - 1 - 1).getTime()    //禁止选择1970年以前的日期
-          );
-        }
-      },
-      //确定按钮是否可点
-      submitButtonEditStatus:false,
-      //提交任务
-      submitTask(row){
-        submit(row.id).then((response) => {
-          if(response.code == 200){
-            this.$modal.msgSuccess("提交成功");
-            this.getList();
-          }
-        });
-      },
-    };
-  },
-  created() {
-    this.queryParams.id = this.bo.id;
-    let params = {"post":this.boAuthority.post};
-    this.queryParams.params = params;
-    this.getList();
-  },
-  methods: {
-    /** 查询任务列表 */
-    getList() {
-      this.loading = true;
-      listTask(this.queryParams).then((response) => {
-        this.taskList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        bo: null,
-        boStage: null,
-        code: null,
-        name: null,
-        type: null,
-        state: null,
-        customer: null,
-        customerName: null,
-        linkman: null,
-        linkmanName: null,
-        salesOrg: null,
-        salesOrgName: null,
-        dept: null,
-        deptName: null,
-        staff: null,
-        staffName: null,
-        startTime: null,
-        deadlineTime: null,
-        content: null,
-        tenantId: null,
-        revision: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        delFlag: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.operatingState = "Insert";
-      this.reset();
-      this.form.bo = this.bo.id;
-      this.form.boName = this.bo.boName;
-      this.form.boStage = this.bo.boStage;
-      this.form.customer = this.bo.customer;
-      this.form.customerName = this.bo.customerName;
-      this.form.startTime = new Date();
-      this.form.state = "0";
-      this.open = true;
-      this.title = "添加任务";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.operatingState = "Update";
-      this.reset();
-      const id = row.id || this.ids;
-      getTask(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改任务";
-        this.timer = new Date().getTime();
-      });
-    },
-    /** 查看按钮操作 */
-    handleBrowse(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getTask(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.operatingState = "Browse";
-        this.title = "基础信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.submitButtonEditStatus = true;
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateTask(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              this.submitButtonEditStatus = false;
-            });
-          } else {
-            addTask(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              this.submitButtonEditStatus = false;
-            });
-          }
-        }else{
-          this.submitButtonEditStatus = false;
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal
-        .confirm('是否确认删除任务编号为"' + row.code + '"的数据项？')
-        .then(function () {
-          return delTask(row.id);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    //联系人弹窗附加查询条件
-    additionalCondition(){
-      return {
-        parame:{
-          customer: this.form.customer
-        }
-      }
-    },
-    // 触发员工参照列表
-    refereStaff() {
-      this.$refs.staffSelect.init();
-    },
-    //员工参照列表选择后
-    staffSelectionsToInput(selections) {
-      this.form.staff = selections[0].userName;
-      this.form.staffName = selections[0].nickName;
-      this.form.dept = selections[0].deptId;
-      this.form.deptName = selections[0].deptName;
-      this.form.salesOrg = selections[0].orgId;
-      this.form.salesOrgName = selections[0].orgName;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.btn_grooup {
-  margin-bottom: 10px;
-  display: flex;
-  justify-content: flex-end;
-}
-</style>

src/views/business/spd/bo/behavior/index.vue

@@ -64,7 +64,7 @@
         @click="handleExport"
       >导出</el-button>
     </div>
-    <el-table v-loading="loading" :data="behaviorList" height="700px">
+    <el-table v-loading="loading" :data="behaviorList">
       <el-table-column label="负责人" align="center" prop="staffName" />
       <el-table-column label="行动日期" align="center" prop="time" />
       <el-form-item label="行动日期" prop="time">
@@ -119,6 +119,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      class="paginationClass"
     />
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form size="mini" ref="form" :model="form" :rules="rules" label-width="80px" :disabled="this.operatingState == 'Browse'">
@@ -555,4 +556,13 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
 </style>

src/views/business/spd/bo/contact/index.vue

@@ -44,7 +44,7 @@
         :fileSize="2"
       ></BatchImport>
     </div>
-    <el-table size="mini" v-loading="loading" :data="contactList" height="700px">
+    <el-table size="mini" v-loading="loading" :data="contactList">
       <el-table-column width="200" label="编号" align="center" prop="code" />
       <el-table-column show-overflow-tooltip label="姓名" align="center" prop="name" />
       <el-table-column label="性别" align="center" prop="gander" >
@@ -103,6 +103,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      class="paginationClass"
     />
 
     <!-- 添加或修改联系人管理对话框 -->
@@ -640,4 +641,13 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
 </style>

src/views/business/spd/bo/plan/add.vue

@@ -252,8 +252,8 @@
           planName: '',
           charger: this.$store.state.user.id,
           chargerName: this.$store.state.user.nickName,
-          dept: this.$store.state.user.deptId,
-          deptName: this.$store.state.user.deptName,
+          dept: this.$store.state.user.adminDept,
+          deptName: this.$store.state.user.adminDeptName,
           startDate: this.getNextWeek(1),
           deadlineTime: this.getNextWeek(7),
           type: '0',
@@ -339,9 +339,9 @@
         this.basicForm.state = 0
         //复制之后执行人和部门变为当前账号所有者
         this.basicForm.charger = this.$store.state.user.id,
-          this.basicForm.chargerName = this.$store.state.user.nickName
-        this.basicForm.dept = this.$store.state.user.deptId
-        this.basicForm.deptName = this.$store.state.user.deptName
+        this.basicForm.chargerName = this.$store.state.user.nickName
+        this.basicForm.dept = this.$store.state.user.adminDept
+        this.basicForm.deptName = this.$store.state.user.adminDeptName
         if (this.basicForm.chargerName) {
           this.reBackRefer('CONTACTS_PARAM', this.basicForm.chargerName)
         }

src/views/business/spd/bo/statement/index.vue

@@ -25,13 +25,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="商机来源" prop="boSource">
-        <el-select
-          v-model="queryParams.boSource"
-          clearable
-        >
+      <el-form-item label="赢单状态" prop="winningState">
+        <el-select v-model="queryParams.winningState" placeholder="" clearable>
           <el-option
-            v-for="dict in dict.type.mk_bo_source"
+            v-for="dict in dict.type.mk_bo_winstate"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -46,10 +43,19 @@
     </el-form>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="SPD商机" name="0">
-        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo" :height="height">
+        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo">
           <el-table-column width="300" show-overflow-tooltip label="商机名称" align="center" prop="boName" />
-          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="赢单率状态" align="center" prop="winningState">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.mk_bo_winstate"
+                :value="scope.row.winningState"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
+          <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
           <el-table-column label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
@@ -106,10 +112,19 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="耗材集采商机" name="1">
-        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo" :height="height">
+        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo">
           <el-table-column width="300" show-overflow-tooltip label="商机名称" align="center" prop="boName" />
-          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="赢单率状态" align="center" prop="winningState">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.mk_bo_winstate"
+                :value="scope.row.winningState"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
+          <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
           <el-table-column label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
@@ -174,10 +189,19 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="医疗耗材商机" name="2">
-        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo" :height="height">
+        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo">
           <el-table-column width="300" show-overflow-tooltip label="商机名称" align="center" prop="boName" />
-          <el-table-column label="部门" align="center" prop="deptName" />
-          <el-table-column width="100" label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
+          <el-table-column label="赢单率状态" align="center" prop="winningState">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.mk_bo_winstate"
+                :value="scope.row.winningState"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
+          <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
+          <el-table-column width="200" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
           <el-table-column label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
@@ -258,10 +282,19 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="医疗设备商机" name="3">
-        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo" :height="height">
+        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo">
           <el-table-column width="300" show-overflow-tooltip label="商机名称" align="center" prop="boName" />
-          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="赢单率状态" align="center" prop="winningState">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.mk_bo_winstate"
+                :value="scope.row.winningState"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
+          <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
           <el-table-column label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
@@ -326,10 +359,19 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="军队医疗设备商机" name="4">
-        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo" :height="height">
+        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo">
           <el-table-column width="300" show-overflow-tooltip label="商机名称" align="center" prop="boName" />
-          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="赢单率状态" align="center" prop="winningState">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.mk_bo_winstate"
+                :value="scope.row.winningState"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
+          <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
           <el-table-column label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
@@ -394,10 +436,19 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="工程商机" name="5">
-        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo" :height="height">
+        <el-table size="mini" :data="boList" v-loading="loading" @cell-dblclick="toBo">
           <el-table-column width="300" show-overflow-tooltip label="商机名称" align="center" prop="boName" />
-          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="赢单率状态" align="center" prop="winningState">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.mk_bo_winstate"
+                :value="scope.row.winningState"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
+          <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
           <el-table-column label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
@@ -469,6 +520,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      class="paginationClass"
     />
   </div>
 </template>
@@ -483,6 +535,7 @@ export default {
   dicts: [
     "mk_bo_type",
     "mk_bo_source",
+    "mk_bo_winstate"
   ],
   data() {
     return {
@@ -507,14 +560,12 @@ export default {
       //分页参数
       total:0,
       loading: true,
-      //表格高度
-      height: "200px",
       //阶段列表
       mk_bo_stage: [],
     };
   },
   created() {
-    this.height = window.innerHeight - 250 + "px"
+    this.queryParams.winningState = '0';
     var e = {
       name: '0',
     }
@@ -576,3 +627,20 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.btn_grooup {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
+</style>

src/views/business/spd/bo/task/index.vue

@@ -96,10 +96,10 @@
     </div>
 
     <el-table
+      size="mini"
       v-loading="loading"
       :data="taskList"
       @selection-change="handleSelectionChange"
-      height="700px"
     >
       <el-table-column label="序号" type="index" width="50" align="center" fixed/>
       <el-table-column width="150" label="任务编码" align="center" prop="code" />
@@ -200,6 +200,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      class="paginationClass"
     />
 
     <!-- 添加或修改任务对话框 -->
@@ -706,4 +707,13 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
 </style>