Merge branch 'master' of gitee.com:beiwu/cmanager

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

@@ -22,7 +22,7 @@
         <el-option v-for="(item,index) in userNatureList" :key="index" :label="item.label" :value="item.value">{{item.label}}</el-option>
       </el-select>
     </template> -->
-      <template slot-scope="{ disabled }" slot="wage">
+      <!-- <template slot-scope="{ disabled }" slot="wage">
         <el-input
           placeholder="请输入 参考工资"
           v-model="obj.wage"
@@ -46,7 +46,7 @@
             </template>
           </el-select>
         </el-input>
-      </template>
+      </template> -->
 
       <template slot="cityId" slot-scope="{ disabled }">
         <jl-city-cascader
@@ -89,7 +89,6 @@
               :fetch-suggestions="querySearchAsync"
               placeholder="请选择行业类型"
               @select="handleSelect"
-              maxlength="15"
               show-word-limit
               ref="selectTradeId"
               >
@@ -116,7 +115,6 @@
               :fetch-suggestions="querySearchAsyncWorkType"
               placeholder="请选择工种"
               @select="handleSelectWorkType"
-              maxlength="15"
               show-word-limit
               :disabled = "worktypeDisabled"
               >
@@ -554,14 +552,94 @@ export default {
               {
                 label: "参考工资",
                 prop: "wage",
-                formslot: true,
-                labelslot: false,
-                errorslot: false,
+                type: "select",
+                dicData: [
+                  {
+                    value: '10-15元/小时',
+                    label: '10-15元/小时',
+                  },
+                  {
+                    value: '16-20元/小时',
+                    label: '16-20元/小时',
+                  },
+                  {
+                    value: '21-25元/小时',
+                    label: '21-25元/小时',
+                  },
+                  {
+                    value: '26-30元/小时',
+                    label: '26-30元/小时',
+                  },
+                  {
+                    value: '30元/小时以上',
+                    label: '30元/小时以上',
+                  },
+                  {
+                    value: '100-150元/天',
+                    label: '100-150元/天',
+                  },
+                  {
+                    value: '151-200元/天',
+                    label: '151-200元/天',
+                  },
+                  {
+                    value: '201-250元/天',
+                    label: '201-250元/天',
+                  },
+                  {
+                    value: '251-300元/天',
+                    label: '251-300元/天',
+                  },
+                  {
+                    value: '300元/天以上',
+                    label: '300元/天以上',
+                  },
+                  {
+                    value: '2000元（含）以下/月',
+                    label: '2000元（含）以下/月',
+                  },
+                  {
+                    value: '2000-5000元（含）/月',
+                    label: '2000-5000元（含）/月',
+                  },
+                  {
+                    value: '5000-8000元（含）/月',
+                    label: '5000-8000元（含）/月',
+                  },
+                  {
+                    value: '8000-10000元（含）/月',
+                    label: '8000-10000元（含）/月',
+                  },
+                  {
+                    value: '10000-15000元（含）/月',
+                    label: '10000-15000元（含）/月',
+                  },
+                  {
+                    value: '15000-20000元（含）/月',
+                    label: '15000-20000元（含）/月',
+                  },
+                  {
+                    value: '20000-25000元（含）/月',
+                    label: '20000-25000元（含）/月',
+                  },
+                  {
+                    value: '25000-30000元（含）/月',
+                    label: '25000-30000元（含）/月',
+                  },
+                  {
+                    value: '30000元以上/月',
+                    label: '30000元以上/月',
+                  },
+                  {
+                    value: '面议、暂无要求',
+                    label: '面议、暂无要求',
+                  }
+                ],
                 rules: [
                   {
                     required: true,
-                    whitespace: true,
-                    validator: wage,
+                    // whitespace: true,
+                    // validator: wage,
                     trigger: "blur",
                   },
                 ],

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

@@ -199,7 +199,7 @@ import { viewContractImg, certCheckPass, getCode, resetPwd } from "@/api/manage/
 import { contractDownload } from "@/api/manage/esignature.js";//api
 import Resume from "@/components/resume/index";
 import { idNumberDDesensitization } from "@/util/util";
-import { applyStatus } from '@/api/manage/econtract'
+// import { applyStatus } from '@/api/manage/econtract'
 import { mapGetters } from 'vuex'
 import { dateFormat } from "@/util/date";
 import { getConfig } from '@/api/tenant/config'