Selaa lähdekoodia

商机页面优化;

001295 1 vuosi sitten
vanhempi
commit
b1c1bff28c

+ 8 - 0
src/api/business/spd/bo/task.js

@@ -42,3 +42,11 @@ export function delTask(taskId) {
     method: 'delete'
   })
 }
+
+//提交任务
+export function submit(id) {
+  return request({
+    url: '/mk/bo/task/submit/' + id,
+    method: 'post'
+  })
+}

+ 12 - 12
src/views/business/spd/bo/statement/index.vue

@@ -43,10 +43,10 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="SPD商机" name="0">
         <el-table :data="boList" v-loading="loading">
-          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column width="200" show-overflow-tooltip label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
-          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column width="200" show-overflow-tooltip label="商机名称" align="center" prop="boName" />
           <el-table-column label="商机编码" align="center" prop="boCode" />
           <el-table-column label="创建日期" align="center" prop="createTime" />
           <el-table-column label="商机挖掘" align="center" prop="b000">
@@ -101,10 +101,10 @@
       </el-tab-pane>
       <el-tab-pane label="耗材集采商机" name="1">
         <el-table :data="boList" v-loading="loading">
-          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column show-overflow-tooltip label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
-          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column show-overflow-tooltip label="商机名称" align="center" prop="boName" />
           <el-table-column label="商机编码" align="center" prop="boCode" />
           <el-table-column label="创建日期" align="center" prop="createTime" />
           <el-table-column label="商机挖掘" align="center" prop="b100">
@@ -167,10 +167,10 @@
       </el-tab-pane>
       <el-tab-pane label="医疗耗材商机" name="2">
         <el-table :data="boList" v-loading="loading">
-          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column show-overflow-tooltip label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
-          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column show-overflow-tooltip label="商机名称" align="center" prop="boName" />
           <el-table-column label="商机编码" align="center" prop="boCode" />
           <el-table-column label="创建日期" align="center" prop="createTime" />
           <el-table-column label="商机挖掘" align="center" prop="b200">
@@ -249,10 +249,10 @@
       </el-tab-pane>
       <el-tab-pane label="医疗设备商机" name="3">
         <el-table :data="boList" v-loading="loading">
-          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column show-overflow-tooltip label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
-          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column show-overflow-tooltip label="商机名称" align="center" prop="boName" />
           <el-table-column label="商机编码" align="center" prop="boCode" />
           <el-table-column label="创建日期" align="center" prop="createTime" />
           <el-table-column label="商机挖掘" align="center" prop="b300">
@@ -315,10 +315,10 @@
       </el-tab-pane>
       <el-tab-pane label="军队医疗设备商机" name="4">
         <el-table :data="boList" v-loading="loading">
-          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column show-overflow-tooltip label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
-          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column show-overflow-tooltip label="商机名称" align="center" prop="boName" />
           <el-table-column label="商机编码" align="center" prop="boCode" />
           <el-table-column label="创建日期" align="center" prop="createTime" />
           <el-table-column label="商机挖掘" align="center" prop="b400">
@@ -381,10 +381,10 @@
       </el-tab-pane>
       <el-tab-pane label="工程商机" name="5">
         <el-table :data="boList" v-loading="loading">
-          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column show-overflow-tooltip label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
-          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column show-overflow-tooltip label="商机名称" align="center" prop="boName" />
           <el-table-column label="商机编码" align="center" prop="boCode" />
           <el-table-column label="创建日期" align="center" prop="createTime" />
           <el-table-column label="需求信息收集" align="center" prop="b500">

+ 40 - 126
src/views/business/spd/bo/task/index.vue

@@ -141,7 +141,7 @@
         align="center"
         prop="salesOrgName"
       />
-      <el-table-column label="部门名称" align="center" prop="deptName" />
+      <el-table-column show-overflow-tooltip label="部门名称" align="center" prop="deptName" />
       <el-table-column label="负责人名称" align="center" prop="staffName" />
       <el-table-column
         label="截止时间"
@@ -155,7 +155,7 @@
       </el-table-column>
       <el-table-column label="任务内容" align="center" prop="content" />
       <el-table-column
-        show-overflow-tooltip
+        width="250"
         label="操作"
         fixed="right"
         align="center"
@@ -165,9 +165,30 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-s-promotion"
+            icon="el-icon-search"
             @click="handleBrowse(scope.row)"
-            >跟进</el-button
+            >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-top"
+            @click="submitTask(scope.row)"
+            v-if="scope.row.state == 0"
+            >提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.state == 0"
+            >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-if="scope.row.state == 0"
+            >删除</el-button
           >
         </template>
       </el-table-column>
@@ -413,7 +434,7 @@
           :source="'TaskList'"
           :bo="this.form"
           :boAuthority="boAuthority"
-          v-if="this.operatingState != 'Insert'"
+          v-if="this.operatingState == 'Browse'"
         />
         
       <div slot="footer">
@@ -427,27 +448,6 @@
         <el-button size="mini" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 客户参照 -->
-    <CustomerRef
-      ref="customerSelect"
-      @doSubmit="customerSelectionsToInput"
-      :single="true"
-    />
-    <!-- 联系人参照 -->
-    <ContactRef
-      ref="contactSelect"
-      @doSubmit="contactSelectionsToInput"
-      :single="true"
-      :outerQueryParams="this.bo"
-    />
-    <!-- 组织参照 -->
-    <OrgRef ref="orgSelect" @doSubmit="orgSelectionsToInput" :single="true" />
-    <!-- 部门参照 -->
-    <DeptRef
-      ref="deptSelect"
-      @doSubmit="deptSelectionsToInput"
-      :single="true"
-    />
     <!-- 员工参照 -->
     <StaffRef
       ref="staffSelect"
@@ -459,7 +459,7 @@
 
 
 <script>
-import { listTask, getTask, delTask, addTask, updateTask } from "@/api/business/spd/bo/task";
+import { listTask, getTask, delTask, addTask, updateTask,submit } from "@/api/business/spd/bo/task";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import CustomerRef from "@/views/business/spd/bo/refer/customer/index.vue";
 import ContactRef from "@/views/business/spd/bo/refer/contact/index.vue";
@@ -509,25 +509,10 @@ export default {
         pageNum: 1,
         pageSize: 10,
         boName: null,
-        boStage: null,
         code: null,
         name: null,
-        type: null,
         state: null,
-        customer: null,
         customerName: null,
-        linkman: null,
-        salesOrg: null,
-        salesOrgName: null,
-        dept: null,
-        deptName: null,
-        staff: null,
-        staffName: null,
-        startTime: null,
-        deadlineTime: null,
-        content: null,
-        tenantId: null,
-        revision: null,
       },
       // 表单参数
       form: {
@@ -639,6 +624,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.operatingState = "Update";
       this.reset();
       const id = row.id || this.ids
       getTask(id).then(response => {
@@ -648,7 +634,7 @@ export default {
         this.title = "修改任务";
       });
     },
-    /** 提交按钮 */
+    /** 提交表单 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -669,60 +655,24 @@ export default {
         }
       });
     },
+    //提交任务
+    submitTask(row){
+      submit(row.id).then((response) => {
+        if(response.code == 200){
+          this.$modal.msgSuccess("提交成功");
+          this.getList();
+        }
+      });
+		},
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项?').then(function() {
-        return delTask(ids);
+      this.$modal.confirm('是否确认删除任务编号为"' + row.code + '"的数据项?').then(function() {
+        return delTask(row.id);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-	  /** 行动序号 */
-    rowMkBoBehaviorIndex({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
-    /** 行动添加按钮操作 */
-    handleAddMkBoBehavior() {
-      let obj = {};
-      obj.type = "";
-      obj.time = "";
-      obj.customer = "";
-      obj.customerName = "";
-      obj.linkman = "";
-      obj.linkmanName = "";
-      obj.purpose = "";
-      obj.result = "";
-      obj.assist = "";
-      obj.assistContent = "";
-      obj.salesOrg = "";
-      obj.salesOrgName = "";
-      obj.dept = "";
-      obj.deptName = "";
-      obj.staff = "";
-      obj.staffName = "";
-      obj.content = "";
-      obj.tenantId = "";
-      obj.revision = "";
-      this.mkBoBehaviorList.push(obj);
-    },
-    /** 行动删除按钮操作 */
-    handleDeleteMkBoBehavior() {
-      if (this.checkedMkBoBehavior.length == 0) {
-        this.$modal.msgError("请先选择要删除的行动数据");
-      } else {
-        const mkBoBehaviorList = this.mkBoBehaviorList;
-        const checkedMkBoBehavior = this.checkedMkBoBehavior;
-        this.mkBoBehaviorList = mkBoBehaviorList.filter(function(item) {
-          return checkedMkBoBehavior.indexOf(item.index) == -1
-        });
-      }
-    },
-    /** 复选框选中数据 */
-    handleMkBoBehaviorSelectionChange(selection) {
-      this.checkedMkBoBehavior = selection.map(item => item.index)
-    },
     //联系人弹窗附加查询条件
     additionalCondition(){
       return {
@@ -731,42 +681,6 @@ export default {
         }
       }
     },
-    // 触发客户参照列表
-    refereCustomer() {
-      this.$refs.customerSelect.init();
-    },
-    //客户参照列表选择后
-    customerSelectionsToInput(selections) {
-      this.form.customer = selections[0].id;
-      this.form.customerName = selections[0].name;
-    },
-    // 触发联系人参照列表
-    refereContact() {
-      this.$refs.contactSelect.init();
-    },
-    //联系人参照列表选择后
-    contactSelectionsToInput(selections) {
-      this.form.linkman = selections[0].id;
-      this.form.linkmanName = selections[0].name;
-    },
-    // 触发组织参照列表
-    refereOrg() {
-      this.$refs.orgSelect.init();
-    },
-    //组织参照列表选择后
-    orgSelectionsToInput(selections) {
-      this.form.salesOrg = selections[0].deptId;
-      this.form.salesOrgName = 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();

+ 28 - 105
src/views/business/spd/bo/task/taskList.vue

@@ -22,28 +22,6 @@
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          >删除</el-button
-        >
-      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -97,7 +75,7 @@
       </el-table-column>
       <el-table-column width="200" show-overflow-tooltip label="任务内容" align="center" prop="content" />
       <el-table-column
-        width="200"
+        width="250"
         label="操作"
         fixed="right"
         align="center"
@@ -114,25 +92,29 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            :disabled="!boAuthority.boAuthority.taskEdit"
-            >修改</el-button
-          >
+            icon="el-icon-search"
+            @click="handleBrowse(scope.row)"
+            >查看</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-view"
-            @click="handleBrowse(scope.row)"
-            :disabled="!boAuthority.boAuthority.taskView"
-            >查看</el-button
-          >
+            icon="el-icon-top"
+            @click="submitTask(scope.row)"
+            v-if="scope.row.state == 0"
+            >提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.state == 0"
+            >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            :disabled="!boAuthority.boAuthority.taskDel"
+            v-if="scope.row.state == 0"
             >删除</el-button
           >
         </template>
@@ -376,7 +358,7 @@
           :source="'TaskList'"
           :bo="this.form"
           :boAuthority="boAuthority"
-          v-if="this.operatingState != 'Insert'"
+          v-if="this.operatingState == 'Browse'"
         />
         
       <div slot="footer">
@@ -391,27 +373,6 @@
         <el-button size="mini" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 客户参照 -->
-    <CustomerRef
-      ref="customerSelect"
-      @doSubmit="customerSelectionsToInput"
-      :single="true"
-    />
-    <!-- 联系人参照 -->
-    <ContactRef
-      ref="contactSelect"
-      @doSubmit="contactSelectionsToInput"
-      :single="true"
-      :outerQueryParams="this.bo"
-    />
-    <!-- 组织参照 -->
-    <OrgRef ref="orgSelect" @doSubmit="orgSelectionsToInput" :single="true" />
-    <!-- 部门参照 -->
-    <DeptRef
-      ref="deptSelect"
-      @doSubmit="deptSelectionsToInput"
-      :single="true"
-    />
     <!-- 员工参照 -->
     <StaffRef
       ref="staffSelect"
@@ -550,6 +511,15 @@ export default {
       },
       //确定按钮是否可点
       submitButtonEditStatus:false,
+      //提交任务
+      submitTask(row){
+        submit(row.id).then((response) => {
+          if(response.code == 200){
+            this.$modal.msgSuccess("提交成功");
+            this.getList();
+          }
+        });
+      },
     };
   },
   created() {
@@ -695,11 +665,10 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除任务编号为"' + ids + '"的数据项?')
+        .confirm('是否确认删除任务编号为"' + row.code + '"的数据项?')
         .then(function () {
-          return delTask(ids);
+          return delTask(row.id);
         })
         .then(() => {
           this.getList();
@@ -707,52 +676,6 @@ export default {
         })
         .catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        "drp-business/task/export",
-        {
-          ...this.queryParams,
-        },
-        `task_${new Date().getTime()}.xlsx`
-      );
-    },
-    // 触发客户参照列表
-    refereCustomer() {
-      this.$refs.customerSelect.init();
-    },
-    //客户参照列表选择后
-    customerSelectionsToInput(selections) {
-      this.form.customer = selections[0].id;
-      this.form.customerName = selections[0].name;
-    },
-    // 触发联系人参照列表
-    refereContact() {
-      this.$refs.contactSelect.init();
-    },
-    //联系人参照列表选择后
-    contactSelectionsToInput(selections) {
-      this.form.linkman = selections[0].id;
-      this.form.linkmanName = selections[0].name;
-    },
-    // 触发组织参照列表
-    refereOrg() {
-      this.$refs.orgSelect.init();
-    },
-    //组织参照列表选择后
-    orgSelectionsToInput(selections) {
-      this.form.salesOrg = selections[0].deptId;
-      this.form.salesOrgName = 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();