flat: 暂存

src/api/tenant/serve.js

@@ -145,3 +145,12 @@ export const getMatchServeList =
     })
   }
 
+  export const getListAllPolicy =
+  (params) => {
+    return request({
+      url: '/api/jobslink-api/serve/listAllPolicy',
+      method: 'get',
+      params: params
+    })
+  }
+

src/views/manage/station/inviteCode.vue

@@ -57,8 +57,8 @@
         <el-form-item label="手机号:" prop="phone" >
           <el-input style="width: 260px" v-model="inviteCodeForm.phone" placeholder="请输入手机号" ></el-input>
         </el-form-item>
-        <el-form-item label="手机号:" prop="remarks" >
+        <el-form-item label="备注:" prop="remarks" >
-          <el-input type="textarea" style="width: 260px" v-model="inviteCodeForm.remarks" placeholder="请输入手机号" ></el-input>
+          <el-input type="textarea" style="width: 260px" v-model="inviteCodeForm.remarks" placeholder="请输入备注" ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">

src/views/tenant/main/serve/index.vue

@@ -98,7 +98,9 @@
             </tag-select>
           </template>
           <!--自定义按钮-->
-          <template slot="menuLeft">
+          <template slot="menuRight">
+            <el-button type="primary" size="small" icon="el-icon-delete" @click="() => { $refs.crud.rowAdd(); selectPolicyTree = []}">
+              新增</el-button>
             <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
               :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_talents_groupdelete, false)">
               删除</el-button>
@@ -106,7 +108,14 @@
           <template slot="name" slot-scope="{row}">
             <span>{{ row.name }}</span>
             <!-- <span v-else>{{ row.name }}（<span style="color: red;">未实名</span>）</span> -->
-
+          </template>
+          <template slot="policyIdsForm" slot-scope="{row}">
+            <el-cascader
+              v-model="selectPolicyTree"
+              :options="listAllPolicyTree"
+              :props="{ expandTrigger: 'hover', multiple: true, label: 'name', value: 'value', children: 'child'}"
+              @change="handleChange"
+            ></el-cascader>
           </template>
           <!--/自定义按钮-->
           <template slot-scope="{row,index}" slot="menu">
@@ -315,7 +324,8 @@ import {
   getServeListTalents,
   getMatchWorkStation,
   getMatchPolicy,
-  getMatchServeList
+  getMatchServeList,
+  getListAllPolicy
 } from "@/api/tenant/serve";
 import { detail as missionDetail } from "@/api/tenant/mission";
 import { detail as workDetail } from "@/api/tenant/postzp";
@@ -332,6 +342,7 @@ import missionView from "../../mission/Table/missionView.vue";
 import workView from "../../works/Table/missionView.vue"
 import {serviceType} from "@/common/dic";
 import Tinymce from "@/components/Tinymce";
+import {forEach} from "lodash";
 const page = {
   pageSize: 10,
   currentPage: 1,
@@ -429,6 +440,8 @@ export default {
       logPage: Object.assign({} ,page),
       obj: {},
       excelForm: { isCovered: 1 },
+      listAllPolicyTree: [],
+      selectPolicyTree: [],
     };
   },
   components: { addGroups, transferGroups, Resume, ied, missionView, workView, Tinymce},
@@ -485,7 +498,7 @@ export default {
       };
       return {
         height: "auto",
-        dialogWidth: "30%",
+        dialogWidth: "60%",
         calcHeight: 180,
         align: "center",
         menuAlign: "center",
@@ -493,13 +506,14 @@ export default {
         columnBtn: false,
         searchBtn: true,
         searchShow: true,
+        addBtn: false,
         viewBtn: true,
         searchMenuSpan: 6,
         border: true,
         index: false,
         indexLabel: "序号",
         selection: true,
-        dialogType: "dialog",
+        dialogType: "drawer",
         dialogClickModal: false,
         column: [
           {
@@ -507,6 +521,15 @@ export default {
             prop: "companyName",
             addDisplay: false,
           },
+          {
+            label: "政策",
+            prop: "policyIds",
+            // search: true,
+            span: 24,
+            hide: true,
+            // display: false,
+            formslot: true,
+          },
           {
             label: "服务名称",
             prop: "name",
@@ -870,8 +893,18 @@ export default {
     this.initDept();
     // this.getWorkTypes();
     this.getLabelList();
+    this.getListAllPolicyTree()
   },
   methods: {
+    handleChange(item) {
+      console.log(item)
+    },
+    async getListAllPolicyTree() {
+      let resData = await getListAllPolicy({})
+      if(resData.data.code === 200) {
+        this.listAllPolicyTree = resData.data.data
+      }
+    },
     toPolicyDetail(row) {
       console.log(row)
       console.log()
@@ -1073,6 +1106,7 @@ export default {
     },
     /*获取人才详情 */
     beforeOpen(done, type) {
+      const self = this
       if (["edit", "view", "add"].includes(type)) {
         if (type === "edit" || type === "view") {
           setTimeout(() => {
@@ -1080,6 +1114,8 @@ export default {
               (res) => {
                 this.obj = res.data.data;
                 this.tempWorkType = this.obj.serveLabels.split(",");
+                const policyIds = self.treeIteration(this.listAllPolicyTree, res.data.data.policyIds.split(','))
+                self.selectPolicyTree = policyIds
                 done();
               },
               (error) => {
@@ -1093,23 +1129,39 @@ export default {
         }
       }
     },
+    treeIteration(tree, ids) {
+      if( !(tree.length && ids.length) ) return;
+      let arr = []
+      tree.forEach((treeItem) => {
+        treeItem.child.forEach((item) => {
+          if(ids.some((id) => item.value === id)) {
+            arr.push([treeItem.value, item.value])
+          }
+        })
+      })
+      return arr;
+    },
     /*新增人才*/
     rowSave(row, done) {
-      add({
+      let params = {
-        groupId: row.groupId,
+          groupId: row.groupId,
-        name: row.name,
+          name: row.name,
-        serveLabels: row.serveLabels,
+          serveLabels: row.serveLabels,
-        remarks: row.remarks,
+          remarks: row.remarks,
-      }).then(
+          policyIds:  this.selectPolicyTree.map((item) => item[1]).join(','),
+      }
+      add(params).then(
         () => {
           this.$message({
             type: "success",
             message: "操作成功!",
           });
           done();
+          this.selectPolicyTree = []
           this.refresh();
         },
         (error) => {
+          this.selectPolicyTree = []
           window.console.log(error);
           done();
         }

src/views/tenant/mission/Dialog/CopyMission.vue

@@ -339,7 +339,7 @@ export default {
                     );
                   },
                 },
-                change:({value})=>{
+                blur:({value})=>{
                   self.obj.etime='';
                   if(value){
                     self.stimeDate=value.split(' ')[0]
@@ -349,7 +349,6 @@ export default {
                     self.endTimeFlag=true
                   }
                 },
-
                 rules: [
                   {
                     required: true,
@@ -365,6 +364,7 @@ export default {
                 type: "date",
                 placeholder: "请选择任务结束日期",
                 format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd 23:59:59",
                 disabled:self.endTimeFlag,
                 pickerOptions: {
                   disabledDate(time) {
@@ -372,15 +372,9 @@ export default {
                       return true
                     }
                     if(self.days){
-                      let mutiply=1000*60*60*24;
+                      // let mutiply=1000*60*60*24;
-                      return !(
+                      return !( time.getTime() > Date.now() && (!self.startTime || (time.getTime() > self.startTime )))
-                      time.getTime() > Date.now() &&
-                      (!self.startTime ||
-                        (time.getTime() > self.startTime &&
-                          time.getTime() < self.startTime + self.days*mutiply))
-                    );
                     }
-
                   },
                 },
                 rules: [

src/views/tenant/works/Dialog/CopyMission.vue

@@ -460,28 +460,17 @@ export default {
                 placeholder: "请选择岗位结束日期",
                 format: "yyyy-MM-dd",
                 valueFormat: "yyyy-MM-dd 00:00:00",
-                // pickerOptions: {
+                pickerOptions: {
-                //   disabledDate(time) {
+                  disabledDate(time) {
-                //     return !(
+                    if(!self.obj.stime){
-                //       time.getTime() > Date.now() &&
+                      return true
-                //       (!self.endTime ||
+                    }
-                //         (time.getTime() < self.endTime &&
+                    if(self.days){
-                //           time.getTime() > self.endTime - 2678400000)) &&
+                      // let mutiply=1000*60*60*24;
-                //       (!self.siginTime || time.getTime() > self.siginTime)
+                      return !( time.getTime() > Date.now() && (!self.startTime || (time.getTime() > self.startTime )))
-                //     );
+                    }
-                //   },
+                  },
-                // },
+                },
-                // change:({value})=>{
-                //   self.obj.etime='';
-                //   if(value){
-                //     self.etimeDate=value.split(' ')[0]
-                //     self.endTimeFlag=false
-                //   }
-                //   else{
-                //     self.endTimeFlag=true
-                //   }
-                // },
-
                 rules: [
                   {
                     required: true,