flat: 增加筛选条件

src/views/manage/station/mainList.vue

@@ -202,23 +202,23 @@ export default {
         dialogType: "drawer",
         dialogFullscreen: true,
         column: [
-          {
+          // {
-            label: "所属机构",
+          //   label: "所属机构",
-            prop: "deptId",
+          //   prop: "deptId",
-            type: "tree",
+          //   type: "tree",
-            multiple: false,
+          //   multiple: false,
-            dicData: this.depTree,
+          //   dicData: this.depTree,
-            props: {
+          //   props: {
-              label: "title",
+          //     label: "title",
-              value: 'value'
+          //     value: 'value'
-            },
+          //   },
-            checkStrictly: true,
+          //   checkStrictly: true,
-            search: true,
+          //   search: true,
-            span: 20,
+          //   span: 20,
-            hide: true,
+          //   hide: true,
-            searchLabelWidth: 80,
+          //   searchLabelWidth: 80,
-            searchSpan: 6,
+          //   searchSpan: 6,
-          },
+          // },
           {
             label: "用工单位",
             prop: "comname",
@@ -284,13 +284,13 @@ export default {
                 display: true,
                 size: "small",
                 prop: "masterName",
-                rules: [
+                // rules: [
-                  {
+                //   {
-                    required: true,
+                //     required: true,
-                    whitespace: true,
+                //     whitespace: true,
-                    message: "请输入法人姓名",
+                //     message: "请输入法人姓名",
-                  },
+                //   },
-                ],
+                // ],
               },
               {
                 type: "input",
@@ -300,10 +300,10 @@ export default {
                 size: "small",
                 prop: "masterIdentity",
                 rules: [
-                  {
+                  // {
-                    required: true,
+                  //   required: true,
-                    message: "请输入身份证号",
+                  //   message: "请输入身份证号",
-                  },
+                  // },
                   {
                     validator: (rule, value, callback) => {
                       if (check18IdCardNo(value)) {

src/views/manage/works/index.vue

@@ -76,7 +76,7 @@
       @success="onLoad(page, query)"
     ></delay-dialog>
     <el-drawer title="详情" :visible.sync="viewDrawer" size="60%">
-      <post-view :model="view"></post-view>
+      <post-view :model="view" :wage="true"></post-view>
     </el-drawer>
     <zp-view ref="zpView"></zp-view>
     <wage-view ref="wageView"></wage-view>

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

@@ -228,6 +228,19 @@ export default {
             searchLabelWidth: 80,
             change: this.groupChange
           },
+          {
+            label: "是否已退出",
+            prop: "isDeleted",
+            dicData: [
+              { value: 1, label: "是" },
+              { value: 0, label: "否" },
+            ],
+            type: 'select',
+            search: true,
+            hide: true,
+            searchLabelWidth: 100,
+            searchSpan: 8,
+          },
           {
             label: "手机号",
             prop: "telphone",

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

@@ -84,12 +84,16 @@
         ></jl-cityLabel-cascader>
       </template>
       <template slot-scope="{ row }" slot="wage">
-        <div class="input-with-select">
+        <div>
-          <el-input v-model="obj.wage" placeholder="请输入工资" type="number"></el-input>
+          <div class="input-with-select">
-         ~ <el-input placeholder="请输入工资" type="number" v-model="obj.wageUpper" ></el-input>
+            <el-input v-model="obj.wage" placeholder="请输入工资" type="number"></el-input>
-         <span>元/人·月</span>
+           ~ <el-input placeholder="请输入工资" type="number" v-model="obj.wageUpper" ></el-input>
+           <span>元/人·月</span>
+          </div>
+          <div class="info">
+            <p>不低于德阳市最低工资</p>
+          </div>
         </div>
-
       </template>
       <template slot-scope="{ disabled }" slot="skillIds">
         <skill-select
@@ -122,14 +126,14 @@
         ></super-map-view>
       </template>
       <!-- 行业类型 -->
-      <!-- <template slot="tradeId">
+      <template slot="tradeId">
         <div class="tradeId">
             <el-autocomplete
               popper-class="my-autocomplete"
-              v-model.trim="tradeState"
+              v-model="obj.tradeNames"
-              :fetch-suggestions="querySearchAsync"
               placeholder="请选择行业类型"
               @select="handleSelect"
+              disabled="true"
               show-word-limit
               ref="selectTradeId"
               >
@@ -138,7 +142,7 @@
               </template>
             </el-autocomplete>
         </div>
-      </template> -->
+      </template>
       <!-- 工种 -->
       <template slot="worktypeIds">
         <div class="tradeId">
@@ -520,7 +524,9 @@ export default {
               {
                 label: "行业类型",
                 prop: "tradeId",
-                type: "select",
+                type: "cascader",
+                // type: "select",
+                formslot: true,
                 dicData: this.tradeData,
                 props: {
                   label: "name",
@@ -563,22 +569,22 @@ export default {
                 prop: "jobDescription",
                 type: "textarea",
                 rules: [
+                  // {
+                  //   required: true,
+                  //   whitespace: true,
+                  //   message: "请输入岗位描述",
+                  //   trigger: "blur",
+                  // },
                   {
-                    required: true,
+                    min: 0,
-                    whitespace: true,
+                    max: 500,
-                    message: "请输入岗位描述",
+                    message: "长度在 0 到 500 个字",
-                    trigger: "blur",
-                  },
-                  {
-                    min: 30,
-                    max: 200,
-                    message: "长度在 30 到 200 个字",
                     trigger: "blur",
                   },
                 ],
-                placeholder: "请输入岗位描述，字数30-200字以内",
+                placeholder: "请输入岗位描述，字数0-500字以内",
                 span: 24,
-                maxlength: 200,
+                maxlength: 500,
                 showWordLimit: true,
               },
             ],
@@ -1121,6 +1127,8 @@ export default {
             education: 7,
             experienceDesc: "不限经验",
             userNature: "灵活用工",
+            tradeId: row.tradeId,
+            tradeNames: row.jobCompanyIndustry,
           };
           this.selectedSkills = [];
           this.drawer = true;
@@ -1205,4 +1213,10 @@ export default {
 .el-drawer .avue-form {
   padding: 0;
 }
+
+.info {
+  font-size: 12px;
+  color: red;
+  margin-top: -16px;
+}
 </style>

src/views/util/post-view.vue

@@ -34,6 +34,16 @@
                 {{ format(model.etime) }}
               </el-form-item>
             </el-col>
+            <el-col span="12">
+              <el-form-item label="参考工资：" v-if="wage">{{
+                  model.wage
+                }}~{{model.wageUpper}}{{ wageUnitCategory[model.wageUnitCategory] }}
+              </el-form-item>
+              <el-form-item label="参考工资：" v-else>{{
+                model.wage
+              }}{{ wageUnitCategory[model.wageUnitCategory] }}
+            </el-form-item>
+            </el-col>
           </el-row>
         </el-collapse-item>
 
@@ -48,10 +58,14 @@
               <el-form-item label="招聘人数：">{{ model.peopleNum }}人</el-form-item>
             </el-col>
             <el-col span="12">
-              <el-form-item label="参考工资：">{{
+              <el-form-item label="参考工资：" v-if="wage">{{
                   model.wage
-                }}{{ wageUnitCategory[model.wageUnitCategory] }}
+                }}~{{model.wageUpper}}{{ wageUnitCategory[model.wageUnitCategory] }}
               </el-form-item>
+              <el-form-item label="参考工资：" v-else>{{
+                model.wage
+              }}{{ wageUnitCategory[model.wageUnitCategory] }}
+            </el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -250,7 +264,7 @@ function getDic(arr) {
 }
 
 export default {
-  props: {model: Object},
+  props: {model: Object, wage:Boolean},
   data() {
     return {
       activeNames: ["1", "2", "3", "4", "5"],