flat: 资金合并

src/views/manage/mission/index.vue

@@ -171,6 +171,9 @@
           v-if="vaildData(permission.manage_mission_zpview, false)"
           >招聘情况</el-button> -->
       </template>
+      <template slot="wage"slot-scope="{ row }">
+        <div>{{row.wage}}{{wageUnitCategoryStateEnum[row.wageUnitCategory]}}</div>
+      </template>
     </avue-crud>
     <el-drawer title="详情" :visible.sync="viewDrawer" size="60%">
       <mission-view :model="view"></mission-view>
@@ -196,6 +199,10 @@ import zpView from "./zpView";
 import { missionState, wageUnitCategoryState, recruitStatus, dataSourcesEnum, educationState } from "@/common/dic";
 import { calcDate } from "@/util/date";
 import { Message } from "element-ui";
+const wageUnitCategoryStateEnum = {}
+wageUnitCategoryState.map((item) => {
+  wageUnitCategoryStateEnum[item.value] = item.label
+})
 import lodash from "lodash";
 const message = lodash.throttle(
   function (options) {
@@ -214,6 +221,7 @@ export default {
       dataSourcesEnum,
       educationState,
       downloadButton: false,
+      wageUnitCategoryStateEnum,
       view: {},
       form: {},
       selectionList: [],
@@ -284,15 +292,8 @@ export default {
             search: false,
             searchSpan: 5,
             display: false,
-          },
-          {
-            label: "工资单位",
-            prop: "wageUnitCategory",
-            search: false,
-            // hide: true,
-            dicData: wageUnitCategoryState,
-            searchSpan: 5,
-            display: false,
+            slot: true,
+            width: 140,
           },
           {
             label: "零工工种",

src/views/manage/works/index.vue

@@ -131,6 +131,9 @@
         >导出</el-button
         >
       </template>
+      <template slot="wage"slot-scope="{ row }">
+        <div>{{row.wage}}{{wageUnitCategoryStateEnum[row.wageUnitCategory]}}</div>
+      </template>
     </avue-crud>
     <delay-dialog
       ref="delay"
@@ -168,7 +171,10 @@ import { calcDate } from "@/util/date";
 import { Message } from "element-ui";
 import lodash from "lodash";
 import {Auditing} from "@/api/manage/mission";
-
+const wageUnitCategoryStateEnum = {}
+wageUnitCategoryState.map((item) => {
+  wageUnitCategoryStateEnum[item.value] = item.label
+})
 const message = lodash.throttle(
   function (options) {
     Message(options);
@@ -186,6 +192,7 @@ export default {
       dataSourcesEnum,
       educationState,
       downloadButton: false,
+      wageUnitCategoryStateEnum,
       view: {},
       form: {},
       selectionList: [],
@@ -254,15 +261,8 @@ export default {
             search: false,
             searchSpan: 5,
             display: false,
-          },
-          {
-            label: "工资单位",
-            prop: "wageUnitCategory",
-            search: false,
-            // hide: true,
-            dicData: wageUnitCategoryState,
-            searchSpan: 5,
-            display: false,
+            slot: true,
+            width: 140,
           },
           {
             label: "岗位工种",

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

@@ -10,6 +10,9 @@
         <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"
           v-show="vaildData(permission.tenant_mission_add, false)">批量导入</el-button>
       </template>
+      <template slot="wage"slot-scope="{ row }">
+        <div>{{row.wage}}{{wageUnitCategoryStateEnum[row.wageUnitCategory]}}</div>
+      </template>
       <!--/自定义按钮-->
       <!--自定义列-->
       <template slot="missionTitle" slot-scope="{ row }">
@@ -110,7 +113,10 @@ import { dateFormat } from "@/util/date";
 import { getTemplate } from "@/api/resource/template";
 import saveButton from "./saveButton";
 import {dataSourcesEnum, educationState, missionState, recruitStatus, wageUnitCategoryState} from "@/common/dic";
-
+const wageUnitCategoryStateEnum = {}
+wageUnitCategoryState.map((item) => {
+  wageUnitCategoryStateEnum[item.value] = item.label
+})
 export default {
   components: {
     CopyMission,
@@ -135,6 +141,7 @@ export default {
   },
   data() {
     return {
+      wageUnitCategoryStateEnum,
       excelBox: false,
       excelForm: { isCovered: 1 },
       excelOption: {
@@ -240,15 +247,8 @@ export default {
             search: false,
             searchSpan: 5,
             display: false,
-          },
-          {
-            label: "工资单位",
-            prop: "wageUnitCategory",
-            search: false,
-            // hide: true,
-            dicData: wageUnitCategoryState,
-            searchSpan: 5,
-            display: false,
+            slot: true,
+            width: 140,
           },
           {
             label: "零工工种",

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

@@ -10,6 +10,9 @@
           <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"
           v-show="vaildData(permission.tenant_works_add, false)">批量导入</el-button>
       </template>
+      <template slot="wage"slot-scope="{ row }">
+        <div>{{row.wage}}{{wageUnitCategoryStateEnum[row.wageUnitCategory]}}</div>
+      </template>
       <!--/自定义按钮-->
       <!--自定义列-->
       <template slot="jobName" slot-scope="{ row }">
@@ -115,7 +118,10 @@ import { dateFormat } from "@/util/date";
 import { getTemplate } from "@/api/resource/template";
 import saveButton from "./saveButton";
 import {dataSourcesEnum, educationState, missionState, recruitStatus, wageUnitCategoryState} from "@/common/dic";
-
+const wageUnitCategoryStateEnum = {}
+wageUnitCategoryState.map((item) => {
+  wageUnitCategoryStateEnum[item.value] = item.label
+})
 export default {
   components: {
     CopyMission,
@@ -139,6 +145,7 @@ export default {
   },
   data() {
     return {
+      wageUnitCategoryStateEnum,
       excelBox: false,
       excelForm: { isCovered: 1 },
       excelOption: {
@@ -243,15 +250,8 @@ export default {
             search: false,
             searchSpan: 5,
             display: false,
-          },
-          {
-            label: "工资单位",
-            prop: "wageUnitCategory",
-            search: false,
-            // hide: true,
-            dicData: wageUnitCategoryState,
-            searchSpan: 5,
-            display: false,
+            slot: true,
+            width: 140,
           },
           {
             label: "岗位工种",

vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://192.168.1.106:8000',
+        target: 'http://10.165.0.173:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {