营销-SPD-商机:商机功能优化；

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

@@ -5,7 +5,14 @@
     <el-row type="flex" class="row-bg" justify="space-around">
       <el-col :span="4">
         <div class="grid-content bg-purple">
-          <el-button size="small" @click="handleBack">返回</el-button>
+          <el-button
+            type="info"
+            plain
+            icon="el-icon-back"
+            size="small"
+            @click="handleBack"
+            >返回</el-button
+          >
         </div>
       </el-col>
       <el-col :span="16">
@@ -63,7 +70,7 @@
           icon="el-icon-user"
           size="small"
           @click="allocation()"
-          v-if="this.boAuthority.post == 0"
+          v-if="this.boAuthority.post == 0 && this.form.basic.winningState == 0"
           >分配</el-button
         >
       </el-col>

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

@@ -84,6 +84,17 @@
           ></el-option>
         </el-select>
       </el-form-item> -->
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -581,6 +592,8 @@ export default {
       },
       //阶段列表
       mk_bo_stage: [],
+      // 查询日期范围
+      dateRange: [],
     };
   },
   created() {
@@ -590,7 +603,7 @@ export default {
     /** 查询商机基础信息列表 */
     getList() {
       this.loading = true;
-      listBasic(this.queryParams).then((response) => {
+      listBasic(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
         this.basicList = response.rows;
         //对商机名称进行加*
         console.log(this.basicList);
@@ -665,6 +678,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

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

@@ -999,7 +999,7 @@
           <Filemanager
             @reload="reload"
             :form="form"
-            :name="'设备清单'"
+            :name="'商机审议会'"
             :fileName="form.amfBoFlow.businessCouncilAccessoryName"
             :fileUrlid="form.amfBoFlow.businessCouncilAccessoryUrlId"
             :fileCreateBy="form.amfBoFlow.businessCouncilAccessoryCreateBy"

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

@@ -75,7 +75,8 @@
       <el-table-column label="销售组织" align="center" prop="salesOrgName" v-if="source == 'Behavior'"/>
       <el-table-column label="部门" align="center" prop="deptName" v-if="source == 'Behavior'"/>
 
-      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" v-if="this.source == 'BoDetails' ? this.bo.winningState == 0 ? true : false : true">
+      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" v-if="this.source == 'BoDetails' ? this.bo.winningState == 0 ? true : false : true"> -->
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -396,6 +397,7 @@ export default {
     };
   },
   created() {
+    console.log('this.boAuthority',this.boAuthority);
     if(this.source == 'Behavior'){
       this.queryParams = this.bo;
     }
@@ -409,7 +411,6 @@ export default {
       this.queryParams.taskCode = this.bo.code;
       console.log("this.bo", this.bo);
     }
-    console.log("this.queryParams", this.queryParams);
     this.getList();
   },
   methods: {

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

@@ -15,7 +15,7 @@
       </el-form-item>
     </el-form>
 
-    <BehaviorList :key="timer" :source = "'Behavior'" :bo="queryParams" />
+    <BehaviorList :key="timer" :source = "'Behavior'" :bo="queryParams" :boAuthority="boAuthority" />
   </div>
 </template>
 
@@ -78,6 +78,15 @@ export default {
       },
       //重新加载子组件参数
       timer: '',
+      //行动权限写死
+      boAuthority:{
+        boAuthority:{
+          behaviorAdd:true,
+          behaviorEdit:true,
+          behaviorView:true,
+          behaviorDel:true,
+        }
+      },
     };
   },
   created() {

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

@@ -222,7 +222,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <ContactList :key="timer" :source = "'Contact'" :bo="this.queryParams" />
+    <ContactList :key="timer" :source = "'Contact'" :bo="this.queryParams" :boAuthority="boAuthority" />
   </div>
 </template>
 
@@ -333,6 +333,15 @@ export default {
       },
       //重新加载子组件参数
       timer: '',
+      //列表权限写死
+      boAuthority:{
+        boAuthority:{
+          contactAdd:true,
+          contactEdit:true,
+          contactView:true,
+          contactDel:true,
+        }
+      },
     };
   },
   created() {

src/views/business/spd/bo/education/educationList.vue

@@ -89,7 +89,9 @@
             v-model="form.enrollDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择入学日期">
+            placeholder="请选择入学日期"
+            :picker-options="editStartOptions"
+            >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="毕业日期" prop="graduationDate">
@@ -97,7 +99,9 @@
             v-model="form.graduationDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择毕业日期">
+            placeholder="请选择毕业日期"
+            :picker-options="editStopOptions"
+            >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="学校名称" prop="school">
@@ -170,10 +174,10 @@ export default {
       // 表单校验
       rules: {
         enrollDate: [
-          { required: true, message: "入学日期不能为空", trigger: "blur" }
+          { required: true, message: "入学日期不能为空", trigger: ["blur", "change"] }
         ],
         graduationDate: [
-          { required: true, message: "毕业日期不能为空", trigger: "blur" }
+          { required: true, message: "毕业日期不能为空", trigger: ["blur", "change"] }
         ],
         school: [
           { required: true, message: "学校名称不能为空", trigger: "blur" }
@@ -181,7 +185,24 @@ export default {
         education: [
           { required: true, message: "学历不能为空", trigger: "blur" }
         ],
-      }
+      },
+      editStartOptions: {
+        disabledDate: time => {
+          if (!this.form.graduationDate) {
+            return time.getTime() < new Date(1970 - 1 - 1).getTime();   //禁止选择1970年以前的日期
+          } else {
+            return time.getTime() > new Date(this.form.graduationDate);
+          }
+        }
+      },
+      editStopOptions: {
+        disabledDate: time => {
+          return (
+            time.getTime() < new Date(this.form.enrollDate) ||
+            time.getTime() < new Date(1970 - 1 - 1).getTime()    //禁止选择1970年以前的日期
+          );
+        }
+      },
     };
   },
   created() {

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

@@ -2,11 +2,18 @@
   <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="boType">
-        <el-input
-          v-model="queryParams.url"
+        <el-select
+          v-model="queryParams.boType"
+          @change="boTypeChange"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="dict in dict.type.mk_bo_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="模板名称" prop="name">
         <el-input
@@ -47,6 +54,8 @@
         </template>
       </el-table-column>
       <el-table-column label="模板名称" align="center" prop="name" />
+      <el-table-column label="上传者" align="center" prop="createByName" />
+      <el-table-column label="上传时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -176,6 +185,11 @@ export default {
     this.getList();
   },
   methods: {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
     /** 查询文件模板列表 */
     getList() {
       this.loading = true;

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

@@ -252,6 +252,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="请选开始时间"
+                :picker-options="editStartOptions"
               >
               </el-date-picker>
             </el-form-item>
@@ -264,6 +265,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="请选择截止时间"
+                :picker-options="editStopOptions"
               >
               </el-date-picker>
             </el-form-item>
@@ -532,10 +534,10 @@ export default {
           { required: true, message: "负责人不能为空", trigger: "blur" },
         ],
         startTime: [
-          { required: true, message: "开始时间不能为空", trigger: "blur" },
+          { required: true, message: "开始时间不能为空", trigger: ["blur", "change"] },
         ],
         deadlineTime: [
-          { required: true, message: "截止时间不能为空", trigger: "blur" },
+          { required: true, message: "截止时间不能为空", trigger: ["blur", "change"] },
         ],
         content: [
           { required: true, message: "任务内容不能为空", trigger: "blur" },
@@ -545,6 +547,23 @@ export default {
       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年以前的日期
+          );
+        }
+      },
     };
   },
   created() {