flat: 国庆节暂存

.env.production

@@ -4,4 +4,5 @@ VUE_APP_REPLACE_STR = {"{oss_file_url}": "http://10.165.0.173:8000", "https://dy
 VUE_APP_LOGIN_NEXT = http://10.160.7.216:9920/casserver/login?service=http://10.165.0.54:8300/manage/login&stService=http%3A%2F%2F10.165.0.54%3A8300%2Fmanage%2Flogin
 VUE_APP_SUPPER_MAP = http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768
 VUE_APP_TIANDITU_APIKEY = e4266a5e84fe6c10f60c559967f0a03f
+#VUE_APP_LARGESCREEN = http://10.165.0.173/largescreen/
 VUE_APP_LARGESCREEN = http://10.165.0.77/largescreen/

package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
+    "build:test": "vue-cli-service build --mode development",
     "lint": "vue-cli-service lint",
     "analyz": "npm_config_report=true npm run build",
     "test:unit": "vue-cli-service test:unit",

src/api/tenant/mission.js

@@ -365,3 +365,17 @@ export const listCompany = (params) => {
 export const upload = () => {
   return `/api/jobslink-api/missions/mission/importMission?isCovered=1`
 }
+
+export const missionHistory = () => {
+  return request({
+    url: `/api/jobslink-api/missions/mission/history`,
+    method: 'get',
+  })
+}
+
+export const jkWorksHistory = () => {
+  return request({
+    url: `/api/jobslink-api/jkWorks/jkWorks/history`,
+    method: 'get',
+  })
+}

src/components/city-cascader/label.vue

@@ -1,6 +1,6 @@
 <template>
   <el-cascader
-    :options="area.labelData"
+    :options="areaDY"
     :show-all-levels="showAllLevels"
     v-model="county"
     :filterable="filterable"
@@ -24,7 +24,8 @@ export default {
     splicer: {
       type: String,
       default: "-"
-    }
+    },
+    filterCity: Array
   },
   data() {
     return {
@@ -33,10 +34,27 @@ export default {
   },
   created() {
     this.$store.dispatch("InitArea");
+    console.log(this.areaDY)
   },
   watch: {},
   computed: {
     ...mapGetters(["area"]),
+    areaDY: {
+      get() {
+        if (this.filterCity) {
+          const [Province, city, district] = this.filterCity
+          let nextProvince = this.area.labelData.find((area) => area.label === Province)
+          if (city) {
+            nextProvince.children = nextProvince.children.filter((area) => area.label === city)
+          }
+          if (district) {
+            nextProvince.children[0].children = nextProvince.children[0].children.find((area) => area.label === district)
+          }
+          return nextProvince
+        }
+        return this.area.labelData
+      }
+    },
     county: {
       get() {
         if (this.value) {

src/components/map/selectLocation3.vue

@@ -6,24 +6,32 @@
       v-if="showInput"
       :placeholder="placeholder || '如：北京市延庆区延庆镇莲花池村前街50夕阳红养老院'"
     ></el-input>
-    <div class="mapDiv" id="mapDiv" style="width: 100%;height: 300px;"></div>
+    <div class="mapDiv" id="mapDiv" ref="mapDiv" style="width: 100%;height: 300px;"></div>
   </div>
 </template>
 
 <script>
 import {debounce} from '@/util/util';
 
-const script = document.createElement('script')
 let origin = ''
 if (window.location.origin.search('localhost') > 0) {
   origin = 'http://10.165.0.173'
 } else {
   origin = window.location.origin
 }
+loadJS()
+
+function loadJS() {
+  const script = document.createElement('script')
+  script.type = 'text/javascript';
   script.src = origin + '/tianditu/api?v=4.0&tk=' + process.env.VUE_APP_TIANDITU_APIKEY
-script.onload = () => console.warn('-----------天地图加载完成-----------')
+  script.onload = function () {
-document.head.appendChild(script)
+    T.Protocol.value = origin + '/'
-let Tmap = null;
+    console.warn('-----------天地图加载完成-----------')
+  };
+  document.head.appendChild(script);
+}
+
 export default {
   data() {
     return {
@@ -31,6 +39,7 @@ export default {
       addressLocation: '',
       baseUrl: '',
       isInput: true,
+      Tmap: null,
     }
   },
   props: {
@@ -172,10 +181,10 @@ export default {
       }).then(({data}) => {
         if (data.status === '0') {
           const {keyWord, lon, lat, level} = data.location
-          if (!Tmap) {
+          if (!this.Tmap) {
             this.createTmap(lon, lat)
           } else {
-            Tmap.centerAndZoom(new T.LngLat(lon, lat), 15);
+            this.Tmap.centerAndZoom(new T.LngLat(lon, lat), 15);
             this.setIcon(lon, lat);
             this.$emit('addAddress', {
               address: this.addressLocation,
@@ -191,23 +200,23 @@ export default {
     createTmap(lng, lat) {
       const _this = this
       this.$nextTick(() => {
-        console.log(Tmap)
+        if (!this.Tmap) {
-        if (!Tmap) {
+          this.Tmap = new T.Map(this.$refs.mapDiv, {
-          Tmap = new T.Map('mapDiv', {
             projection: 'EPSG:4326',
             minZoom: this.minZoom,
             maxZoom: this.maxZoom
           });
-          Tmap.addEventListener('click', (e) => {
+          this.Tmap.addEventListener('click', (e) => {
             _this.nextPoint(e.lnglat)
           });
         }
-        Tmap.centerAndZoom(new T.LngLat(lng, lat), 15);
+        console.log(this.Tmap)
+        this.Tmap.centerAndZoom(new T.LngLat(lng, lat), 15);
         this.setIcon(lng, lat);
       })
     },
     setIcon(lng, lat) {
-      Tmap.clearOverLays()
+      this.Tmap.clearOverLays()
       const icon = new T.Icon({
         iconUrl: '/img/point.png',
         iconSize: new T.Point(30, 30),
@@ -216,7 +225,7 @@ export default {
       const marker = new T.Marker(new T.LngLat(lng, lat), {
         icon
       });
-      Tmap.addOverLay(marker);
+      this.Tmap.addOverLay(marker);
     },
     nextPoint(lnglat) {
       var that = this;

src/views/manage/company/companyList.vue

@@ -95,7 +95,6 @@
           }}</span>
         <span v-else>-</span>
       </template>
-
       <!--商报状态搜索栏-->
       <!-- <template slot="insuranceOnSearch">
         <el-select
@@ -112,12 +111,10 @@
           >
         </el-select>
       </template> -->
-
-
       <!--保证金状态搜索栏trialOn-->
       <template slot="trialOnSearch">
         <el-select v-model="query.trialOn" placeholder="保证金" @change="selectTrailTyepChange">
-          <el-option v-for="(item, index) in bondList" :key="index" :label="item.label" :value="item.value">{{
+          <el-option v-for="(item, index) in bondList" :key="item.value" :label="item.label" :value="item.value">{{
               item.label
             }}
           </el-option>
@@ -150,6 +147,7 @@ import {check18IdCardNo, isvalidatemobile} from "@/util/validate";
 import {moneyFormat} from "@/util/money";
 import companyRecord from "./companyRecord";
 import {companyStatus} from "@/const/company";
+import {getDeptMyTree} from "@/api/tenant/talents";
 
 const accept = [
   "image/png",
@@ -209,7 +207,7 @@ export default {
       form: {},
       selectionList: [],
       query: {},
-      loading: true,
+      loading: false,
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -218,8 +216,12 @@ export default {
       obj: {},
       data: [],
       selectJW: null,
+      depTree: [],
     };
   },
+  created() {
+    this.getDept()
+  },
   computed: {
     ...mapGetters(["userInfo", "permission"]),
     permissionList() {
@@ -274,6 +276,7 @@ export default {
         editBtn: true,
         addBtnText: "社区街道登记",
         addTitle: "新增机构名称",
+        rowKey: "$index",
         delBtn: false,
         menuWidth: 300,
         labelWidth: 151,
@@ -282,12 +285,25 @@ export default {
         dialogFullscreen: true,
         column: [
           {
-            label: "机构名称",
+            label: "所属机构",
-            prop: "companyName",
+            prop: "deptId",
+            type: "tree",
+            multiple: false,
+            dicData: this.depTree,
+            props: {
+              label: "title",
+              value: 'value'
+            },
+            checkStrictly: true,
             search: true,
+            span: 20,
+            hide: true,
+            searchLabelWidth: 80,
             searchSpan: 6,
-            searchLabelWidth: 100,
+          },
-            display: false,
+          {
+            label: '机构名称',
+            prop: 'companyName',
           },
           {
             label: "联系人姓名",
@@ -299,12 +315,6 @@ export default {
             display: false,
             prop: "phone",
           },
-          {
-            label: "地区",
-            display: false,
-            prop: "cityId",
-            slot: true,
-          },
         ],
         group: [
           {
@@ -334,13 +344,6 @@ export default {
                 display: true,
                 size: "small",
                 prop: "masterName",
-                rules: [
-                  {
-                    required: true,
-                    whitespace: true,
-                    message: "请输入联系人姓名",
-                  },
-                ],
               },
               {
                 type: "input",
@@ -352,21 +355,6 @@ export default {
                   {required: true, trigger: "blur", validator: validatePhone},
                 ],
               },
-              {
-                type: "input",
-                label: "所在地区",
-                span: 20,
-                prop: "cityId",
-                slot: true,
-                formslot: true,
-                display: false,
-                rules: [
-                  {
-                    required: true,
-                    message: "请选择所在地区",
-                  },
-                ],
-              },
               {
                 type: "textarea",
                 label: "备注",
@@ -390,6 +378,15 @@ export default {
     }
   },
   methods: {
+    async getDept() {
+      let params = {
+        tenantId: '000000'
+      }
+      let resData = await getDeptMyTree(params)
+      if (resData.data.code === 200) {
+        this.depTree = resData.data.data
+      }
+    },
     /*地图*/
     addAddress(form) {
       this.obj.address = form.address + (form.title || "");
@@ -639,11 +636,10 @@ export default {
         page.pageSize,
         Object.assign(this.query, params)
       ).then((res) => {
+        this.loading = false;
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
-        this.loading = false;
-
       });
     },
     moneyFormat,

src/views/manage/cuser/talents/index.vue

@@ -275,6 +275,7 @@ export default {
               label: "title",
               value: 'value'
             },
+            hide: true,
             checkStrictly: true,
             span: 24,
             search: true,

src/views/manage/mission/index.vue

@@ -353,11 +353,6 @@ export default {
             },
             span: 6,
           },
-          {
-            label: '机构名称',
-            prop: 'companyName',
-            span: 6,
-          },
           {
             label: '岗位名称',
             prop: 'missionTitle',
@@ -366,7 +361,7 @@ export default {
           {
             label: '地址',
             prop: 'address',
-            placeholder: "北京-北京市-崇文区",
+            placeholder: "请输入地址",
             span: 6,
           }, {
             label: '零工工种',

src/views/manage/station/inviteCode.vue

@@ -119,6 +119,7 @@ import lodash from "lodash";
 import {recruitStatus} from "@/common/dic";
 import {Auditing} from "@/api/manage/mission";
 import PromptDialog from "@/components/promptDialog/index.vue";
+import {getDeptMyTree} from "@/api/tenant/talents";
 
 const inviteCodeRules = {
   stationId: [
@@ -139,7 +140,48 @@ const inviteCodeRules = {
     }
   ],
 }
-const curdOptions = {
+const page = {
+  pageSize: 10,
+  currentPage: 1,
+  total: 0,
+}
+const message = lodash.throttle(
+  function (options) {
+    Message(options);
+  },
+  3000,
+  {trailing: false}
+);
+export default {
+  name: "manage_station_inviteCode",
+  components: {PromptDialog},
+  data() {
+    return {
+      dialogFlag: false,
+      selectIdList: [],
+      distributionCodeDialog: false,
+      inviteCodeRules: Object.assign({}, inviteCodeRules),
+      enterpriseList: [], // 用工单位列表
+      inviteCodeForm: {},
+      inviteCodeList: [],
+      selectionList: [],
+      page: Object.assign({}, page),
+      searchData: {},
+      isEdit: false,
+      loading: false,
+      depTree: []
+    }
+  },
+  created() {
+    this.getDept()
+  },
+  activated() {
+    this.getList() // 用工单位
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    option() {
+      return {
         dateBtn: false,
         addBtn: false,
         tip: false,
@@ -154,7 +196,25 @@ const curdOptions = {
         indexLabel: "序号",
         dialogType: "drawer",
         align: 'center',
-  column: [{
+        column: [
+          {
+            label: "所属机构",
+            prop: "deptId",
+            type: "tree",
+            multiple: false,
+            dicData: this.depTree,
+            props: {
+              label: "title",
+              value: 'value'
+            },
+            checkStrictly: true,
+            search: true,
+            span: 20,
+            hide: true,
+            searchLabelWidth: 80,
+            searchSpan: 6,
+          },
+          {
             label: '机构名称',
             prop: 'companyName',
             search: true,
@@ -215,45 +275,18 @@ const curdOptions = {
           }
         ]
       }
-const page = {
-  pageSize: 10,
-  currentPage: 1,
-  total: 0,
     }
-const message = lodash.throttle(
-  function (options) {
-    Message(options);
-  },
-  3000,
-  {trailing: false}
-);
-export default {
-  name: "manage_station_inviteCode",
-  components: {PromptDialog},
-  data() {
-    return {
-      dialogFlag: false,
-      selectIdList: [],
-      distributionCodeDialog: false,
-      inviteCodeRules: Object.assign({}, inviteCodeRules),
-      enterpriseList: [], // 用工单位列表
-      inviteCodeForm: {},
-      inviteCodeList: [],
-      selectionList: [],
-      option: Object.assign({}, curdOptions),
-      page: Object.assign({}, page),
-      searchData: {},
-      isEdit: false,
-      loading: false,
-    }
-  },
-  activated() {
-    this.getList() // 用工单位
-  },
-  computed: {
-    ...mapGetters(["permission"]),
   },
   methods: {
+    async getDept() {
+      let params = {
+        tenantId: '000000'
+      }
+      let resData = await getDeptMyTree(params)
+      if (resData.data.code === 200) {
+        this.depTree = resData.data.data
+      }
+    },
     diaLogCancel(value) {
       if (!value) {
         return this.$message({

src/views/manage/station/mainList.vue

@@ -50,6 +50,7 @@ import {isMobile, check18IdCardNo, validatenull} from "@/util/validate";
 import {putFile} from "@/api/resource/oss";
 import {getTradeDic} from "@/api/manage/trade";
 import {addressColumn, companyEnum} from "@/common/dic"
+import {getDeptMyTree} from "@/api/tenant/talents";
 
 const accept = [
   "image/png",
@@ -68,6 +69,7 @@ export default {
   name: "manage_station_mainList",
   data() {
     return {
+      depTree: [],
       form: {},
       query: {},
       loading: true,
@@ -77,7 +79,29 @@ export default {
         total: 0,
       },
       checkDrawer: false,
-      option: {
+      data: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(
+          this.permission.manage_station_mainList_add,
+          false
+        ),
+        viewBtn: this.vaildData(
+          this.permission.manage_station_mainList_view,
+          false
+        ),
+        editBtn: this.vaildData(
+          this.permission.manage_station_mainList_edit,
+          false
+        ),
+      };
+    },
+    option() {
+      return {
         height: "auto",
         tip: false,
         searchShow: true,
@@ -94,10 +118,21 @@ export default {
         dialogFullscreen: true,
         column: [
           {
-            label: "机构名称",
+            label: "所属机构",
-            prop: "companyName",
+            prop: "deptId",
+            type: "tree",
+            multiple: false,
+            dicData: this.depTree,
+            props: {
+              label: "title",
+              value: 'value'
+            },
+            checkStrictly: true,
             search: true,
-            display: false,
+            span: 20,
+            hide: true,
+            searchLabelWidth: 80,
+            searchSpan: 6,
           },
           {
             label: "用工单位",
@@ -420,30 +455,22 @@ export default {
             ],
           },
         ],
+      }
+    }
   },
-      data: [],
+  created() {
-    };
+    this.getDept()
-  },
-  computed: {
-    ...mapGetters(["userInfo", "permission"]),
-    permissionList() {
-      return {
-        addBtn: this.vaildData(
-          this.permission.manage_station_mainList_add,
-          false
-        ),
-        viewBtn: this.vaildData(
-          this.permission.manage_station_mainList_view,
-          false
-        ),
-        editBtn: this.vaildData(
-          this.permission.manage_station_mainList_edit,
-          false
-        ),
-      };
-    },
   },
   methods: {
+    async getDept() {
+      let params = {
+        tenantId: '000000'
+      }
+      let resData = await getDeptMyTree(params)
+      if (resData.data.code === 200) {
+        this.depTree = resData.data.data
+      }
+    },
     initData() {
       this.onLoad(this.page, this.query);
     },

src/views/manage/works/index.vue

@@ -365,23 +365,19 @@ export default {
             },
             span: 6,
           },
-          {
-            label: '机构名称',
-            prop: 'companyName',
-            span: 6,
-          },
           {
             label: '岗位名称',
-            prop: 'missionTitle',
+            prop: 'jobName',
             span: 6,
           },
           {
             label: '地址',
             prop: 'address',
-            placeholder: "北京-北京市-崇文区",
+            placeholder: "请输入地址",
             span: 6,
-          }, {
+          },
-            label: '零工工种',
+          {
+            label: '岗位工种',
             prop: 'worktypeNames',
             span: 6,
           },
@@ -494,7 +490,7 @@ export default {
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(this.query, params)
+        params
       ).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;

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

@@ -278,7 +278,7 @@ import PushService from './Dialog/pushService2.vue'
 import {getDeptMyTree} from "@/api/tenant/talents";
 
 const page = {
-  pageSize: 10,
+  size: 10,
   currentPage: 1,
   total: 0,
 }
@@ -893,7 +893,7 @@ export default {
       this.loading = true;
       let paramsed = {
         current: page.currentPage,
-        pageSize: page.pageSize,
+        size: page.size,
         id: this.tenantId,
         ...params
       }
@@ -930,10 +930,12 @@ export default {
       this.query = {}
       this.onLoad(this.page, this.query);
     },
-    infoSizeChange(pageSize) {
+    infoSizeChange(size) {
+      this.page.size = size;
       this.onLoad(this.page, this.query);
     },
     infoCurrentChange(currentPage) {
+      this.page.currentPage = currentPage;
       this.onLoad(this.page, this.query);
     },
     // 匹配任务和岗位
@@ -971,7 +973,7 @@ export default {
         serveId: this.selectInfo.id,
         companyId: this.selectInfo.companyId,
         current: this.logPage.currentPage,
-        size: this.logPage.pageSize
+        size: this.logPage.size
       }).then(res => {
         let _this = this;
         const {records, current, size, total} = res.data.data
@@ -1039,8 +1041,8 @@ export default {
           });
         });
     },
-    logSizeChange(pageSize) {
+    logSizeChange(size) {
-      this.logPage.pageSize = pageSize;
+      this.logPage.size = size;
       this.serveLog(this.selectUserServeLog)
     },
     logCurrentChange(currentPage) {

src/views/tenant/main/talents/LocalWarningDisposal/index.vue

@@ -31,7 +31,7 @@ import {addServeLog, getMainServeUserLog, removeServeLog, updateServeLog} from "
 import {getTenantTalentsWarn, tenantTalentsWarn, updateTenantTalentsWarn} from "@/api/tenant/LocalWarningDisposal";
 
 const page = {
-  pageSize: 10,
+  size: 10,
   currentPage: 1,
   total: 0,
 }
@@ -190,15 +190,15 @@ export default {
       this.page.currentPage = currentPage;
       this.onLoad(this.page, this.query);
     },
-    sizeChange(pageSize) {
+    sizeChange(size) {
-      this.page.pageSize = pageSize;
+      this.page.size = size;
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
       const {releaseTimeRange} = params;
       let paramsed = {
         current: page.currentPage,
-        pageSize: page.pageSize,
+        size: page.size,
         ...this.query
       };
       this.loading = true;
@@ -207,7 +207,7 @@ export default {
         this.dataSource = records;
         this.loading = false;
         this.page = {
-          pageSize: size,
+          size: size,
           currentPage: current,
           total: total,
         }

src/views/tenant/main/talents/latent/index.vue

@@ -882,13 +882,15 @@ export default {
     },
     dateFormat: dateFormat,
     rowStyle(column) {
-      const groupId = column.row.groupId
+      // const groupId = column.row.groupId
-      const groupInfo = this.treeData.find((item) => item.id === groupId)
+      // const groupInfo = this.treeData.find((item) => item.id === groupId)
-      if (groupInfo.groupName === '潜在就业困难人员' || groupInfo.groupName === '潜在就业见习申请人员') {
+      // if (groupInfo.groupName === '潜在就业困难人员' || groupInfo.groupName === '潜在就业见习申请人员') {
-        this.option.column[15].viewDisplay = true
+      //   console.log(this.option.column[15])
-      } else {
+      //   // this.option.column[15].viewDisplay = true
-        this.option.column[15].viewDisplay = false
+      // } else {
-      }
+      //   console.log(this.option.column[15])
+      //   // this.option.column[15].viewDisplay = false
+      // }
     },
     checkUserInfo(row) {
       this.dialogInfo = row

src/views/tenant/main/talents/personFile/index.vue

@@ -14,7 +14,6 @@
         @current-change="currentChange"
         @size-change="sizeChange"
         class="customPage"
-        :row-style="rowStyle"
         :before-open="beforeOpen"
       >
         <template slot-scope="{row}" slot="employInfoListForm">
@@ -95,7 +94,7 @@ import {addServeLog, getMainServeUserLog, removeServeLog, updateServeLog} from "
 import {dateFormat} from "@/util/date";
 
 const page = {
-  pageSize: 10,
+  size: 10,
   currentPage: 1,
   total: 0,
 }
@@ -404,12 +403,12 @@ export default {
       this.page.currentPage = currentPage;
       this.onLoad(this.page, this.query);
     },
-    sizeChange(pageSize) {
+    sizeChange(size) {
-      this.page.pageSize = pageSize;
+      this.page.size = size;
       this.onLoad(this.page, this.query);
     },
-    logSizeChange(pageSize) {
+    logSizeChange(size) {
-      this.logPage.pageSize = pageSize;
+      this.logPage.size = size;
       this.serveLog(this.selectUserServeLog);
     },
     logCurrentChange(currentPage) {
@@ -420,7 +419,7 @@ export default {
       const {releaseTimeRange} = params;
       let paramsed = {
         current: page.currentPage,
-        pageSize: page.pageSize,
+        size: page.size,
         ...this.query
       };
       this.loading = true;
@@ -429,7 +428,7 @@ export default {
         this.dataSource = records;
         this.loading = false;
         this.page = {
-          pageSize: size,
+          size: size,
           currentPage: current,
           total: total,
         }
@@ -442,14 +441,14 @@ export default {
       getMainServeUserLog({
         idNumber: row.idNumber,
         current: this.logPage.currentPage,
-        size: this.logPage.pageSize
+        size: this.logPage.size
       }).then(res => {
         this.loadingLog = false
         const {records, current, size, total} = res.data.data
         this.logDataSource = records
         this.innerDrawerLog = true
         this.logPage = {
-          pageSize: size,
+          size: size,
           currentPage: current,
           total: total,
         }

src/views/tenant/main/talents/personnelserve/index.vue

@@ -75,9 +75,10 @@ import {getList} from "@/api/tenant/personnelserve";
 import {isvalidatemobile} from "@/util/validate";
 import {getDept, getDeptMyTree} from "@/api/tenant/talents";
 import {addServeLog, getMainServeUserLog, removeServeLog, updateServeLog} from "@/api/tenant/serve";
+import {cloneDeep} from "lodash";
 
 const page = {
-  pageSize: 10,
+  size: 10,
   currentPage: 1,
   total: 0,
 }
@@ -123,7 +124,8 @@ export default {
       loadingLog: false,
       innerDrawerLog: false,
       innerDrawerAddLog: false,
-      logValues: {}
+      logValues: {},
+      query: {}
     }
   },
   computed: {
@@ -176,6 +178,7 @@ export default {
             prop: "name",
             // search: true,
             span: 24,
+            searchLabelWidth: 80,
             rules: [
               {
                 required: true,
@@ -190,6 +193,7 @@ export default {
             label: "姓别",
             prop: "aac004",
             type: 'select',
+            searchLabelWidth: 80,
             dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC004",
             props: {
               label: "dictValue",
@@ -215,6 +219,20 @@ export default {
             ],
             search: true,
           },
+          {
+            label: "是否核实",
+            prop: "isConfirm",
+            type: 'select',
+            hide: true,
+            search: true,
+            dicData: [
+              {value: "", label: "全部"},
+              {label: '未核实', value: 0},
+              {label: '已核实', value: 1},
+            ],
+            searchLabelWidth: 100,
+            display: false,
+          },
           {
             label: "手机号",
             prop: "telphone",
@@ -301,6 +319,28 @@ export default {
             maxlength: 100,
             showWordLimit: true,
           },
+          {
+            label: "日志时间",
+            prop: "Time",
+            search: true,
+            type: 'date',
+            searchRange: true,
+            hide: true,
+            display: false,
+            searchLabelWidth: 80,
+            minWidth: 100,
+            searchSpan: 7,
+            startPlaceholder: "日期开始范围",
+            endPlaceholder: "日期结束范围",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            change: ({value}) => {
+              if (value) {
+                this.query.stime = value[0]
+                this.query.etime = value[1]
+              }
+            }
+          },
         ],
       }
     },
@@ -419,9 +459,15 @@ export default {
       });
     },
     searchChange(params, done) {
-      this.query = params;
+      let newObj = Object.assign({}, params);
+      if (params.Time) {
+        newObj.stime = params.Time[0]
+        newObj.etime = params.Time[1]
+        delete newObj.Time;
+      }
+      this.query = newObj;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      this.onLoad(this.page, newObj);
       done();
     },
     searchReset() {
@@ -432,12 +478,12 @@ export default {
       this.page.currentPage = currentPage;
       this.onLoad(this.page, this.query);
     },
-    sizeChange(pageSize) {
+    sizeChange(size) {
-      this.page.pageSize = pageSize;
+      this.page.size = size;
       this.onLoad(this.page, this.query);
     },
-    logSizeChange(pageSize) {
+    logSizeChange(size) {
-      this.logPage.pageSize = pageSize;
+      this.logPage.size = size;
       this.serveLog(this.selectUserServeLog);
     },
     logCurrentChange(currentPage) {
@@ -448,7 +494,7 @@ export default {
       const {releaseTimeRange} = params;
       let paramsed = {
         current: page.currentPage,
-        pageSize: page.pageSize,
+        size: page.size,
         ...this.query
       };
       this.loading = true;
@@ -457,7 +503,7 @@ export default {
         this.dataSource = records;
         this.loading = false;
         this.page = {
-          pageSize: size,
+          size: size,
           currentPage: current,
           total: total,
         }
@@ -470,14 +516,14 @@ export default {
       getMainServeUserLog({
         idNumber: row.idNumber,
         current: this.logPage.currentPage,
-        size: this.logPage.pageSize
+        size: this.logPage.size
       }).then(res => {
         this.loadingLog = false
         const {records, current, size, total} = res.data.data
         this.logDataSource = records
         this.innerDrawerLog = true
         this.logPage = {
-          pageSize: size,
+          size: size,
           currentPage: current,
           total: total,
         }

src/views/tenant/main/talents/serverRecords/index.vue

@@ -31,7 +31,7 @@ import {getTenantTalentsWarn, tenantTalentsWarn, updateTenantTalentsWarn} from "
 import {getServeLogList} from '@/api/tenant/serverRecords'
 
 const page = {
-  pageSize: 10,
+  size: 10,
   currentPage: 1,
   total: 0,
 }
@@ -221,15 +221,15 @@ export default {
       this.page.currentPage = currentPage;
       this.onLoad(this.page, this.query);
     },
-    sizeChange(pageSize) {
+    sizeChange(size) {
-      this.page.pageSize = pageSize;
+      this.page.size = size;
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
       const {releaseTimeRange} = params;
       let paramsed = {
         current: page.currentPage,
-        pageSize: page.pageSize,
+        size: page.size,
         ...params
       };
       this.loading = true;
@@ -238,7 +238,7 @@ export default {
         this.dataSource = records;
         this.loading = false;
         this.page = {
-          pageSize: size,
+          size: size,
           currentPage: current,
           total: total,
         }

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

@@ -23,6 +23,7 @@
           filterable
           v-model="obj.cityId"
           placeholder="请选择 工作地址"
+          :filterCity="['四川省', '德阳市']"
         ></jl-cityLabel-cascader>
       </template>
 
@@ -133,6 +134,7 @@
       </template>
       <!--/自定义表单-->
       <template slot-scope="{ disabled }" slot="menuForm">
+        <el-button type="warning" icon="el-icon-close" @click="closed">重置</el-button>
         <el-button
           icon="el-icon-circle-close"
           @click="drawer = false"
@@ -154,7 +156,8 @@ import {
   workListAdd,
   getMounthDays,
   getDictionary,
-  listCompany
+  listCompany,
+  missionHistory
 } from "@/api/tenant/mission";
 import {getTrade, getWork, getWorkTypes} from "@/api/tenant/common";
 import SkillSelect from "../Dialog/Skill";
@@ -199,7 +202,7 @@ export default {
       skillIdAttr: [],
       obj: {
         wage: 0,
-        wageUnitCategory: 3,
+        wageUnitCategory: 1,
         sex: 0,
         ageDesc: "不限年龄",
         education: 7,
@@ -230,6 +233,7 @@ export default {
     this.$store.dispatch("InitArea");
     this.initData();
     this.getMaxAndMin()
+    this.getHistroyCompanyList()
   },
   watch: {
     "obj.tradeId": function (val, oldval) {
@@ -487,6 +491,7 @@ export default {
                 label: "零工工种",
                 prop: "workSkills",
                 type: "cascader",
+                filterable: true,
                 search: true,
                 display: true,
                 dicUrl: `/api/jobslink-api/tenant/worktypes/base/list?type=1`,
@@ -642,7 +647,7 @@ export default {
               {
                 label: "单位信用代码",
                 prop: "missionCompanyScale",
-                disabled: true,
+                // disabled: true,
                 // rules: [
                 //   {
                 //     required: true,
@@ -655,7 +660,7 @@ export default {
               {
                 label: "所属行业",
                 prop: "missionCompanyIndustry",
-                disabled: true,
+                // disabled: true,
                 // rules: [
                 //   {
                 //     required: true,
@@ -674,7 +679,7 @@ export default {
               {
                 label: "单位性质",
                 prop: "missionCompanyNature",
-                disabled: true,
+                // disabled: true,
                 type: 'select',
                 dicUrl: "/api/jobslink-api/system/dict-biz/dictionary?code=company_nature",
                 props: {
@@ -786,11 +791,62 @@ export default {
     },
   },
   methods: {
+    getHistroyCompanyList() {
+      missionHistory().then((res) => {
+        this.options23 = res.data.data.map((item) => {
+          return {
+            ...item,
+            label: item.missionCompanyName,
+          }
+        })
+      })
+    },
+    resetForm() {
+      this.obj.missionTitle = ""
+      this.obj.stime = ""
+      this.obj.etime = ""
+      this.obj.wage = ""
+      this.obj.workSkills = []
+      this.obj.missionDesc = ""
+      this.obj.ageDesc = "不限年龄"
+      this.obj.education = 7
+      this.obj.experienceDesc = "不限经验"
+      // this.obj.missionCompanyName = ""
+      // this.obj.missionCompanyScale = ""
+      // this.obj.missionCompanyIndustry = ""
+      // this.obj.missionCompanyNature = ""
+      // this.obj.missionCompanyDescription = ""
+      // this.obj.callName = ""
+      // this.obj.callTel = ""
+      // this.obj.callNumber = ""
+      // this.obj.cityId = ""
+      // this.obj.address = ""
+      this.obj.wageUnitCategory = 1
+      this.obj.sex = 0
+      this.obj.userNature = "灵活用工"
+      this.obj.worktypeIds = ""
+      this.obj.$workSkills = ""
+      this.obj.$ageDesc = "不限年龄"
+      this.obj.$education = "初中及以下"
+      this.obj.$experienceDesc = "不限经验"
+      this.obj.$missionCompanyIndustry = ""
+      this.obj.$missionCompanyNature = ""
+    },
     selectMissionCompany(item) {
       const value = this.options23.find((vi) => vi.label === item)
-      this.obj.missionCompanyScale = value.jobCompanyScale
+      this.obj.missionCompanyScale = value.missionCompanyScale
-      this.obj.missionCompanyIndustry = value.jobCompanyIndustry
+      this.obj.missionCompanyIndustry = value.missionCompanyIndustry
-      this.obj.missionCompanyNature = value.jobCompanyNature
+      this.obj.missionCompanyNature = value.missionCompanyNature
+      if (value.callTel) {
+        this.obj.missionCompanyDescription = value.missionCompanyDescription
+        this.obj.callName = value.callName
+        this.obj.callTel = value.callTel
+        this.obj.callNumber = value.callNumber
+        this.obj.cityId = value.cityId
+        this.obj.address = value.address
+        this.obj.lon = value.lon
+        this.obj.lat = value.lat
+      }
     },
     async remoteMethod(query) {
       this.missionCompanyLoad = true
@@ -990,7 +1046,7 @@ export default {
       this.$refs.form.resetForm();
       this.$refs.form.clearValidate();
       this.obj = {
-        wageUnitCategory: 3,
+        wageUnitCategory: 1,
         sex: 0,
         ageDesc: "不限年龄",
         education: 7,
@@ -1056,7 +1112,6 @@ export default {
           this.$jlEvent("trialCheck")
             .then(() => {
               add({
-
                 missionTitle: row.missionTitle,
                 stime: row.stime,
                 etime: row.etime,
@@ -1090,13 +1145,22 @@ export default {
                 lon: row.lon,
               }).then(
                 () => {
-                  this.drawer = false;
-                  done();
                   this.$message({
                     type: "success",
                     message: "操作成功!",
                   });
+                  done()
+                  this.$confirm('是否继续发布岗位？', {
+                    confirmButtonText: "继 续",
+                    cancelButtonText: "取 消",
+                  })
+                    .then(_ => {
+                      this.resetForm()
+                    })
+                    .catch(_ => {
+                      this.drawer = false;
                       this.$emit("back");
+                    });
                 },
                 (error) => {
                   window.console.log(error);
@@ -1140,13 +1204,22 @@ export default {
             lon: row.lon,
           }).then(
             () => {
-              this.drawer = false;
-              done();
               this.$message({
                 type: "success",
                 message: "操作成功!",
               });
+              done()
+              this.$confirm('是否继续发布岗位？', {
+                confirmButtonText: "继 续",
+                cancelButtonText: "取 消",
+              })
+                .then(_ => {
+                  this.closed()
+                })
+                .catch(_ => {
+                  this.drawer = false;
                   this.$emit("back");
+                });
             },
             (error) => {
               window.console.log(error);
@@ -1187,7 +1260,7 @@ export default {
         } else if (type === "add") {
           this.title = "发布任务";
           this.obj = {
-            wageUnitCategory: 3,
+            wageUnitCategory: 1,
             sex: 0,
             ageDesc: "不限年龄",
             education: 7,

src/views/tenant/mission/Table/WaitingMission.vue

@@ -2,8 +2,7 @@
   <div>
     <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="obj" @row-del="rowDel"
                @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen" :page.sync="page"
-               @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+               @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange">
-               @on-load="onLoad">
       <!--自定义按钮-->
       <template slot="menuLeft">
         <save-button type="warning" plain icon="el-icon-plus" size="small" @click="rowCopy('', 'add')"
@@ -202,6 +201,7 @@ export default {
     };
   },
   created() {
+    this.onLoad(this.page, this.query)
   },
   watch: {},
   computed: {
@@ -469,9 +469,11 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query)
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query)
     },
     /*刷新本页 带搜索参数*/
     refreshChange() {
@@ -480,10 +482,14 @@ export default {
     /*加载数据*/
     onLoad(page, params = {}) {
       this.loading = true;
+      this.query = {
+        status: this.query.status,
+        ...params
+      }
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(this.query, params)
+        this.query
       ).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;

src/views/tenant/mission/index.vue

@@ -77,11 +77,6 @@ export default {
             },
             span: 6,
           },
-          {
-            label: '机构名称',
-            prop: 'companyName',
-            span: 6,
-          },
           {
             label: '岗位名称',
             prop: 'missionTitle',
@@ -90,7 +85,7 @@ export default {
           {
             label: '地址',
             prop: 'address',
-            placeholder: "北京-北京市-崇文区",
+            placeholder: "请输入地址",
             span: 6,
           }, {
             label: '零工工种',

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

@@ -54,6 +54,7 @@
           filterable
           v-model="obj.cityId"
           placeholder="请选择 工作地址"
+          :filterCity="['四川省', '德阳市']"
         ></jl-cityLabel-cascader>
       </template>
 
@@ -178,7 +179,8 @@
       </template>
       <!--/自定义表单-->
       <template slot-scope="{ disabled }" slot="menuForm">
-        <!-- <el-button type="primary" icon="el-icon-check" @click="copy" :disabled="formLoading">提交</el-button> -->
+        <!--        <el-button type="primary" icon="el-icon-check" @click="submit">提交</el-button>-->
+        <el-button type="warning" icon="el-icon-close" @click="closed">重置</el-button>
         <el-button
           icon="el-icon-circle-close"
           @click="drawer = false"
@@ -192,7 +194,7 @@
 </template>
 
 <script>
-import {listCompany} from "@/api/tenant/mission";
+import {listCompany, jkWorksHistory, missionHistory} from "@/api/tenant/mission";
 import {add, detail, update, tradeListAdd, getMounthDays, getDictionary} from "@/api/tenant/postzp";
 import {getTrade, getWork, getSkillList, getWorkTypes} from "@/api/tenant/common";
 import SkillSelect from "../Dialog/Skill";
@@ -271,6 +273,7 @@ export default {
     this.$store.dispatch("InitArea");
     this.initData();
     this.getMaxAndMin()
+    this.getHistroyCompanyList()
   },
   watch: {
     "obj.tradeId": function (val, oldval) {
@@ -617,6 +620,7 @@ export default {
                 label: "岗位工种",
                 prop: "workSkills",
                 type: "cascader",
+                filterable: true,
                 search: true,
                 display: true,
                 dicUrl: `/api/jobslink-api/tenant/worktypes/base/list?type=2`,
@@ -770,7 +774,7 @@ export default {
               {
                 label: "单位信用代码",
                 prop: "jobCompanyScale",
-                disabled: true,
+                // disabled: true,
                 // rules: [
                 //   {
                 //     required: true,
@@ -783,7 +787,7 @@ export default {
               {
                 label: "所属行业",
                 prop: "jobCompanyIndustry",
-                disabled: true,
+                // disabled: true,
                 // rules: [
                 //   {
                 //     required: true,
@@ -797,7 +801,7 @@ export default {
                 prop: "jobCompanyNature",
                 label: "单位性质",
                 type: 'select',
-                disabled: true,
+                // disabled: true,
                 dicUrl: "/api/jobslink-api/system/dict-biz/dictionary?code=company_nature",
                 props: {
                   label: "dictValue",
@@ -908,11 +912,59 @@ export default {
     },
   },
   methods: {
+    getHistroyCompanyList() {
+      jkWorksHistory().then((res) => {
+        this.options23 = res.data.data.map((item) => {
+          return {
+            ...item,
+            label: item.jobCompanyName,
+          }
+        })
+      })
+    },
+    resetForm() {
+      this.obj.jobName = ""
+      this.obj.stime = ""
+      this.obj.etime = ""
+      this.obj.wage = ""
+      this.obj.tradeId = ""
+      this.obj.workSkills = true
+      this.obj.jobDescription = ""
+      this.obj.ageDesc = ""
+      this.obj.education = ""
+      this.obj.experienceDesc = ""
+      // this.obj.jobCompanyName = ""
+      // this.obj.jobCompanyIndustry = ""
+      // this.obj.jobCompanyNature = ""
+      // this.obj.jobCompanyDescription = ""
+      // this.obj.callName = ""
+      // this.obj.callTel = ""
+      // this.obj.callNumber = ""
+      // this.obj.cityId = ""
+      // this.obj.address = ""
+      this.obj.selectedSkills = []
+      this.obj.$tradeId = ""
+      this.obj.$workSkills = true
+      this.obj.$ageDesc = ""
+      this.obj.$education = ""
+      this.obj.$experienceDesc = ""
+      this.obj.$jobCompanyNature = ""
+    },
     selectMissionCompany(item) {
       const value = this.options23.find((vi) => vi.label === item)
       this.obj.jobCompanyScale = value.jobCompanyScale
       this.obj.jobCompanyIndustry = value.jobCompanyIndustry
       this.obj.jobCompanyNature = value.jobCompanyNature
+      if (value.callTel) {
+        this.obj.jobCompanyDescription = value.jobCompanyDescription
+        this.obj.callName = value.callName
+        this.obj.callTel = value.callTel
+        this.obj.callNumber = value.callNumber
+        this.obj.cityId = value.cityId
+        this.obj.address = value.address
+        this.obj.lon = value.lon
+        this.obj.lat = value.lat
+      }
     },
     async remoteMethod(query) {
       this.missionCompanyLoad = true
@@ -1229,13 +1281,23 @@ export default {
               lon: row.lon,
             }).then(
               () => {
-                this.drawer = false;
-                done();
                 this.$message({
                   type: "success",
                   message: "操作成功!",
                 });
+                done()
+                this.$confirm('是否继续发布岗位？', {
+                  confirmButtonText: "继 续",
+                  cancelButtonText: "取 消",
+                })
+                  .then(_ => {
+                    this.resetForm()
+                  })
+                  .catch(_ => {
+                    this.drawer = false;
                     this.$emit("back");
+                  });
+
               },
               (error) => {
                 window.console.log(error);
@@ -1279,13 +1341,22 @@ export default {
           lon: row.lon,
         }).then(
           () => {
-            this.drawer = false;
-            done();
             this.$message({
               type: "success",
               message: "操作成功!",
             });
+            done()
+            this.$confirm('是否继续发布岗位？', {
+              confirmButtonText: "继 续",
+              cancelButtonText: "取 消",
+            })
+              .then(_ => {
+                this.closed()
+              })
+              .catch(_ => {
+                this.drawer = false;
                 this.$emit("back");
+              });
           },
           (error) => {
             window.console.log(error);
@@ -1381,7 +1452,7 @@ export default {
         } else if (type === "add") {
           this.title = "发布岗位";
           this.obj = {
-            wageUnitCategory: 2,
+            wageUnitCategory: 3,
             sex: 0,
             ageDesc: "不限年龄",
             education: 7,
@@ -1406,7 +1477,6 @@ export default {
             // this.obj.workSkills = []
             // console.log(res.worktypeIds)
             this.obj.workSkills = !res.worktypeIds || res.worktypeIds.split(',')
-            console.log(res, this.obj)
             // this.obj.workSkills.push(res.worktypeIds)
             // this.obj.workSkills.push(res.skillIds)
             this.drawer = true;

src/views/tenant/works/Table/WaitingMission.vue

@@ -3,7 +3,7 @@
     <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="obj" @row-del="rowDel"
                @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen" :page.sync="page"
                @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
-               @on-load="onLoad">
+    >
       <!--自定义按钮-->
       <template slot="menuLeft">
         <save-button type="warning" plain icon="el-icon-plus" size="small" @click="rowCopy('', 'add')"
@@ -112,6 +112,7 @@
 
 <script>
 import {getList, cancel, detail, upload} from "@/api/tenant/postzp";
+// import {getList, cancel, detail} from "@/api/tenant/mission";
 import CopyMission from "../Dialog/CopyMission";
 import Employ from "../Dialog/Employ";
 import employmentNum from "../Dialog/EmployNumber";
@@ -203,6 +204,7 @@ export default {
     };
   },
   created() {
+    this.onLoad(this.page, this.query)
   },
   watch: {},
   computed: {
@@ -469,9 +471,11 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query)
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query)
     },
     /*刷新本页 带搜索参数*/
     refreshChange() {
@@ -480,16 +484,18 @@ export default {
     /*加载数据*/
     onLoad(page, params = {}) {
       this.loading = true;
+      this.query = {
+        status: this.query.status,
+        ...params
+      }
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(this.query, params)
+        this.query
       ).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
-        console.log(data.records)
-        console.log(this.data)
         this.loading = false;
       });
     },

src/views/tenant/works/index.vue

@@ -88,23 +88,18 @@ export default {
             },
             span: 6,
           },
-          {
-            label: '机构名称',
-            prop: 'companyName',
-            span: 6,
-          },
           {
             label: '岗位名称',
-            prop: 'missionTitle',
+            prop: 'jobName',
             span: 6,
           },
           {
             label: '地址',
             prop: 'address',
-            placeholder: "北京-北京市-崇文区",
+            placeholder: "请输入地址",
             span: 6,
           }, {
-            label: '零工工种',
+            label: '岗位工种',
             prop: 'worktypeNames',
             span: 6,
           },
@@ -145,19 +140,17 @@ export default {
         params.stime = this.search.time[0],
           params.etime = this.search.time[1]
       }
+      this.$nextTick(() => {
         if (this.search.status === 1) {
-        console.log("1111111");
           this.$refs.waiting.onLoad(this.page, params);
         } else if (this.search.status === 2) {
-        console.log("222222");
           this.$refs.onging.onLoad(this.page, params);
         } else if (this.search.status === 3) {
-        console.log("3333333");
           this.$refs.finished.onLoad(this.page, params);
         } else if (this.search.status === 4) {
-        console.log("444444444");
           this.$refs.expired.onLoad(this.page, params);
         }
+      })
       done && done()
     },
     date() {

vue.config.js

@@ -1,4 +1,7 @@
 module.exports = {
+  configureWebpack: {
+    devtool: 'source-map'
+  },
   //路径前缀
   publicPath: "/manage/",
   outputDir: "manage",
@@ -24,8 +27,8 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        // target: 'http://192.168.1.115:8000',
+        target: 'http://192.168.1.115:8000',
-        target: 'http://10.165.0.173:8000',
+        // target: 'http://10.165.0.173:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {