flat：添加识别原因

package.json

@@ -60,5 +60,9 @@
       "vue-cli-service lint",
       "git add"
     ]
+  },
+  "volta": {
+    "node": "14.21.3",
+    "npm": "6.14.18"
   }
 }

src/api/tenant/serve.js

@@ -311,3 +311,19 @@ export const phoneUpdate = (params) => {
     params
   });
 };
+
+export const getMsgContent = (params) => {
+  return request({
+    url: "/api/jobslink-api/serve/getMsgContent",
+    method: "get",
+    params
+  });
+};
+
+export const pushMsg = (params) => {
+  return request({
+    url: "/api/jobslink-api/serve/push/msg",
+    method: "POST",
+    data: params
+  });
+};

src/views/tenant/main/serve/Dialog/pushService2.vue

@@ -10,9 +10,14 @@
                     @input="searchInputChange" v-model="searchInput" clearable>
           </el-input>
         </div>
-        <el-button type="primary" style="width: 80px" size="small" :disabled="pushState" @click="onSubmit">
+        <div>
-          {{ pushState ? '推送中...' : rightTabs ? '推送岗位' : '推送政策' }}
+          <el-button type="primary" style="width: 80px" size="small" @click="informationPush">
-        </el-button>
+            推送信息
+          </el-button>
+          <el-button type="primary" style="width: 80px" size="small" :disabled="pushState" @click="onSubmit">
+            {{ pushState ? '推送中...' : rightTabs ? '推送岗位' : '推送政策' }}
+          </el-button>
+        </div>
       </div>
       <div class="content-right relative">
         <avue-crud height="900" ref="crud2" :data="rightDataList"
@@ -55,7 +60,9 @@ import {
   getSearchAllByUserId,
   pushPolicyUserServe,
   pushPostUserServe,
-  getListAllByPolicy
+  getListAllByPolicy, phoneUpdate,
+  getMsgContent,
+  pushMsg
 } from "@/api/tenant/serve.js";
 import TextTooltip from "@/components/text-tooltip/index.vue";
 import {debounce} from '@/util/util'
@@ -147,6 +154,7 @@ export default {
   props: {
     visible: Boolean,
     rowData: {default: null, type: Function},
+    phoneItem: {default: {}, type: Object},
     changeVisible: {default: null, type: Function},
   },
   computed: {
@@ -160,6 +168,30 @@ export default {
     },
   },
   methods: {
+    async informationPush() {
+      let resData = await getMsgContent()
+      if (resData.status === 200 && resData.data.code === 200) {
+        const data = resData.data
+        this.$confirm(data.msg, {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(async (type) => {
+          if (type === 'confirm') {
+            pushMsg({
+              serveUserId: this.phoneItem.serveUserId,
+              id: this.phoneItem.id
+            }).then((res) => {
+              this.$message.success('推送成功');
+            }).cache(() => {
+              this.$message.error('推送失败');
+            })
+          }
+        })
+      } else {
+        this.$message.error('获取模板失败');
+      }
+    },
     changeTabs(type) {
       this.rightDataList = []
       this.rightTabs = type

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

@@ -223,6 +223,7 @@
     <PushService
       :visible.sync="PushServiceVisible"
       :rowData="selectPushServiceData"
+      :phoneItem="phoneItem"
       ref="pushRef"
     ></PushService>
 
@@ -234,7 +235,8 @@
       title="回访"
       append-to-body
       :visible.sync="phoneDialogVisible"
-      width="30%"
+      width="40%"
+      :rules="rules"
       :before-close="handlePhoneClose">
       <el-form :model="phoneForm" label-position="top" label-width="100px">
         <el-form-item label="验证手机号">
@@ -245,11 +247,25 @@
             <el-checkbox v-for="phone in phoneList" :label="phone" :key="phone">{{ phone }}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="输入手机号">
+        <!--        <el-form-item label="输入手机号">-->
-          <el-input v-model="phoneForm.phone" :disabled="phoneForm.list.length" autocomplete="off"></el-input>
+        <!--          <el-input v-model="phoneForm.phone" :disabled="phoneForm.list.length" autocomplete="off"></el-input>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="是否服务">
+          <el-radio-group v-model="phoneForm.isServe">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否培训" v-show="phoneForm.isServe">
+          <el-radio-group v-model="phoneForm.isTrain">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
+        <el-button @click="handleBasicUpdate">个人基础信息修改</el-button>
+        <!--        <el-button @click="handelJobIntention">求职意愿修改</el-button>-->
     <el-button @click="handlePhoneClose">取 消</el-button>
     <el-button type="primary" @click="handelPhoneConfirm">确 定</el-button>
   </span>
@@ -318,10 +334,20 @@ export default {
       phoneList: [],
       phoneForm: {
         phone: '',
-        list: []
+        list: [],
+        isServe: 0,
+        isTrain: 0,
       },
       phoneItem: null,
       depTree: [],
+      rules: {
+        isServe: [
+          {required: true, message: '请选择是否服务', trigger: 'change'}
+        ],
+        isTrain: [
+          {required: true, message: '请选择是否培训', trigger: 'change'}
+        ],
+      },
       logOption: {
         editBtn: false,
         delBtn: true,
@@ -534,6 +560,11 @@ export default {
             searchLabelWidth: 100,
             searchSpan: 8,
           },
+          {
+            label: "识别原因",
+            prop: "labelsBase",
+            width: 100,
+          }
         ]
       }
     },
@@ -715,6 +746,12 @@ export default {
     //     this.logOption.editBtn = false
     //   }
     // },
+    handleBasicUpdate() {
+      window.open('http://10.160.7.100:8000/jyback/template/general.html#/generalPage?_modulePartId_=1000076072', '_blank');
+    },
+    handelJobIntention() {
+      this.$message({type: "info", message: "功能未配置"});
+    },
     async getDept() {
       let params = {
         tenantId: '000000'
@@ -728,6 +765,7 @@ export default {
     selectPushUserService(row) {
       this.selectPushService().then(() => {
         this.$nextTick(() => {
+          this.phoneItem = row
           this.$refs.pushRef.upDateUser(row)
           this.$refs.pushRef.refLeftSearch(row.name)
         })
@@ -737,7 +775,7 @@ export default {
       let _this = this
       let phone = ''
       if (this.phoneForm.list.length) phone = this.phoneForm.list[0];
-      if (/^1[3-9]{1}\d{9}/.test(this.phoneForm.phone)) phone = this.phoneForm.phone;
+      // if (/^1[3-9]{1}\d{9}/.test(this.phoneForm.phone)) phone = this.phoneForm.phone;
       if (phone) {
         this.$confirm(`手机号为:${phone}`, {
           confirmButtonText: "确定",
@@ -748,6 +786,9 @@ export default {
             idNumber: _this.phoneItem.idNumber,
             phone,
             serveId: this.selectInfo.id,
+            serveUserId: this.phoneItem.serveUserId,
+            isServe: this.phoneForm.isServe,
+            isTrain: this.phoneForm.isTrain
           }
           let resData = await phoneUpdate(params)
           if (resData.data.code === 200) {
@@ -763,6 +804,8 @@ export default {
       this.phoneDialogVisible = false
       this.phoneForm.phone = ''
       this.phoneForm.list = []
+      this.phoneForm.isServe = 0
+      this.phoneForm.isTrain = 0
     },
     async phoneDataList(item) {
       let params = {
@@ -773,6 +816,8 @@ export default {
         this.phoneList = resData.data.data
         this.phoneItem = item
         this.phoneDialogVisible = true
+        this.phoneForm.isServe = item.isServe
+        this.phoneForm.isTrain = item.isTrain
       } else {
         this.$message.error("用户数据异常!");
       }

vue.config.js

@@ -27,8 +27,8 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        // target: 'http://192.168.1.115:8000',
+        target: 'http://192.168.3.11:8000',
-        target: 'http://10.165.0.173:8000',
+        // target: 'http://10.165.0.173:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {