From 16d777c7454740e85ba752fcd9b007495098aa40 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Sun, 7 Apr 2024 14:38:43 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E5=B7=A5=E8=B5=84=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/dic.js                             | 11 ++++----
 src/views/manage/works/index.vue              |  8 ++++++
 .../tenant/mission/Dialog/CopyMission.vue     | 26 +++++++++++++------
 src/views/tenant/works/Dialog/CopyMission.vue | 25 ++++++++++++------
 .../tenant/works/Table/WaitingMission.vue     | 10 ++++++-
 5 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/src/common/dic.js b/src/common/dic.js
index deac88d..c35ae01 100644
--- a/src/common/dic.js
+++ b/src/common/dic.js
@@ -181,13 +181,14 @@ export const insureState = [
 ];
 
 export const wageUnitCategoryState = [
-  { value: 0, label: "元/人·次", disable: true },
   { value: 1, label: "元/人·时", disable: false },
   { value: 2, label: "元/人·天", disable: false },
-  { value: 3, label: "元/人·周", disable: true },
-  { value: 4, label: "元/人·月", disable: true },
-  { value: 5, label: "元/人·个", disable: true },
-  { value: 6, label: "元/人·件", disable: true },
+  { value: 3, label: "元/人·月", disable: true },
+  { value: 4, label: "其他", disable: true },
+  // { value: 0, label: "元/人·次", disable: true },
+  // { value: 4, label: "元/人·周", disable: true },
+  // { value: 5, label: "元/人·个", disable: true },
+  // { value: 6, label: "元/人·件", disable: true },
 ];
 
 export const wageOptionsMonth = [
diff --git a/src/views/manage/works/index.vue b/src/views/manage/works/index.vue
index 8dd0695..3e0272a 100644
--- a/src/views/manage/works/index.vue
+++ b/src/views/manage/works/index.vue
@@ -258,6 +258,14 @@ export default {
             searchSpan: 5,
             display: false,
           },
+          {
+            label: "工资单位",
+            prop: "wageUnitCategory",
+            search: false,
+            dicData: wageUnitCategoryState,
+            searchSpan: 5,
+            display: false,
+          },
           {
             label: "零工工种",
             prop: "worktypeNames",
diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue
index 92bcaca..3fca085 100644
--- a/src/views/tenant/mission/Dialog/CopyMission.vue
+++ b/src/views/tenant/mission/Dialog/CopyMission.vue
@@ -50,6 +50,13 @@
           :type="type"
         ></select-map>
       </template>
+      <template slot-scope="{ row }" slot="wage">
+        <el-input placeholder="请输入工资" v-model="obj.wage" class="input-with-select">
+          <el-select v-model="obj.wageUnitCategory" slot="append" placeholder="请选择">
+            <el-option :label="item.label" v-for="item in wageUnitCategory" :key="item.value" :value="item.value"></el-option>
+          </el-select>
+        </el-input>
+      </template>
       <!-- 行业类型 -->
       <!-- <template slot="tradeId">
         <div class="tradeId">
@@ -397,14 +404,17 @@ export default {
                 label: "参考工资",
                 prop: "wage",
                 type: "select",
-                dicData: wageOptionsWithNoMonth,
-                rules: [
-                  {
-                    required: true,
-                    trigger: "blur",
-                  },
-                ],
-                span: 12,
+                formslot: true,
+                labelslot: false,
+                errorslot: false,
+                // dicData: wageOptionsWithNoMonth,
+                // rules: [
+                //   {
+                //     required: true,
+                //     trigger: "blur",
+                //   },
+                // ],
+                // span: 12,
               },
               {
                 label: "工种",
diff --git a/src/views/tenant/works/Dialog/CopyMission.vue b/src/views/tenant/works/Dialog/CopyMission.vue
index cda921c..2cf5b9a 100644
--- a/src/views/tenant/works/Dialog/CopyMission.vue
+++ b/src/views/tenant/works/Dialog/CopyMission.vue
@@ -56,7 +56,13 @@
           placeholder="请选择 工作地址"
         ></jl-city-cascader>
       </template>
-
+      <template slot-scope="{ row }" slot="wage">
+        <el-input placeholder="请输入工资" v-model="obj.wage" class="input-with-select">
+          <el-select v-model="obj.wageUnitCategory" slot="append" placeholder="请选择">
+            <el-option :label="item.label" v-for="item in wageUnitCategory" :key="item.value" :value="item.value"></el-option>
+          </el-select>
+        </el-input>
+      </template>
       <template slot-scope="{ disabled }" slot="skillIds">
         <skill-select
           ref="skillSelect"
@@ -512,13 +518,16 @@ export default {
                 label: "参考工资",
                 prop: "wage",
                 type: "select",
-                dicData: wageOptionsMonth,
-                rules: [
-                  {
-                    required: true,
-                    trigger: "blur",
-                  },
-                ],
+                formslot: true,
+                labelslot: false,
+                errorslot: false,
+                // dicData: wageOptionsMonth,
+                // rules: [
+                //   {
+                //     required: true,
+                //     trigger: "blur",
+                //   },
+                // ],
                 span: 12,
               },
               {
diff --git a/src/views/tenant/works/Table/WaitingMission.vue b/src/views/tenant/works/Table/WaitingMission.vue
index 2491584..ce56bbb 100644
--- a/src/views/tenant/works/Table/WaitingMission.vue
+++ b/src/views/tenant/works/Table/WaitingMission.vue
@@ -114,7 +114,7 @@ import { mapGetters } from "vuex";
 import { dateFormat } from "@/util/date";
 import { getTemplate } from "@/api/resource/template";
 import saveButton from "./saveButton";
-import {dataSourcesEnum, educationState, missionState, recruitStatus} from "@/common/dic";
+import {dataSourcesEnum, educationState, missionState, recruitStatus, wageUnitCategoryState} from "@/common/dic";
 
 export default {
   components: {
@@ -240,6 +240,14 @@ export default {
             searchSpan: 5,
             display: false,
           },
+          {
+            label: "工资单位",
+            prop: "wageUnitCategory",
+            search: false,
+            dicData: wageUnitCategoryState,
+            searchSpan: 5,
+            display: false,
+          },
           {
             label: "零工工种",
             prop: "worktypeNames",