劳务对接管理

src/routers/modules/base.js

@@ -10,6 +10,18 @@ var routers = [
                         roles: ["admin"],
                         title: '用户管理'
                 }
+        },
+        {
+                path: '/base/labourServices/list',
+                name: 'baseLabourServicesList',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/labourServices-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '劳务对接管理'
+                }
         }
 ]
 

src/views/base/labourServices-detail.vue

@@ -20,96 +20,20 @@
         :rules="ruleValidate"
         :label-width="'100px'"
       >
-        <el-form-item label="" prop="id">
-          <el-input
-            v-model="formModel.id"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
+        <el-form-item label="发布类型" prop="type">
+          <el-radio-group v-model="formModel.type">
+            <el-radio-button label="1">我要用工</el-radio-button>
+            <el-radio-button label="2">我有工人</el-radio-button>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="类型(我要用工人,我有工人等)" prop="type">
-          <el-input
-            v-model="formModel.type"
-            placeholder="请输入类型(我要用工人,我有工人等)"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="内容" prop="content">
-          <el-input
-            v-model="formModel.content"
-            placeholder="请输入内容"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="状态(上架下架等" prop="status">
-          <el-input
-            v-model="formModel.status"
-            placeholder="请输入状态(上架下架等"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="排序号" prop="sortNo">
-          <el-input
-            v-model="formModel.sortNo"
-            placeholder="请输入排序号"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="审批状态" prop="approvalStatus">
-          <el-input
-            v-model="formModel.approvalStatus"
-            placeholder="请输入审批状态"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="createBy">
-          <el-input
-            v-model="formModel.createBy"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="createTime">
-          <el-input
-            v-model="formModel.createTime"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="updateBy">
-          <el-input
-            v-model="formModel.updateBy"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="updateTime">
-          <el-input
-            v-model="formModel.updateTime"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="删除标示" prop="delFlag">
-          <el-input
-            v-model="formModel.delFlag"
-            placeholder="请输入删除标示"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="审批人" prop="approvePersonId">
-          <el-input
-            v-model="formModel.approvePersonId"
-            placeholder="请输入审批人"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="审批时间" prop="approveTime">
-          <el-input
-            v-model="formModel.approveTime"
-            placeholder="请输入审批时间"
-            style="width: 300px"
-          ></el-input>
+        <el-form-item label="内容摘要" prop="content">
+            <mce-editor
+              ref="editor"
+              uploadName="upfile"
+              v-model="formModel.content"
+              :url="uploadUrl"
+              :config="editorConfig"
+            ></mce-editor>
         </el-form-item>
       </el-form>
     </div>
@@ -124,52 +48,27 @@
 <script>
 import Constant from "@/constant";
 import labourServicesApi from "@/api/base/labourServices";
+import MceEditor from "@/components/Tinymce";
+import { getToken } from "@/utils/auth";
+
 
 export default {
   props: ["businessKey", "title"],
+  components: {
+    "mce-editor": MceEditor,
+  },
   data() {
     return {
-      formModel: {},
+      formModel: {
+        content:"",
+      },
       ruleValidate: {
-        id: [{ required: true, message: "不能为空", trigger: "blur" }],
-        type: [
-          {
-            required: true,
-            message: "类型(我要用工人,我有工人等)不能为空",
-            trigger: "blur",
-          },
-        ],
-        content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
-        status: [
-          {
-            required: true,
-            message: "状态(上架下架等不能为空",
-            trigger: "blur",
-          },
-        ],
-        sortNo: [
-          { required: true, message: "排序号不能为空", trigger: "blur" },
-        ],
-        approvalStatus: [
-          { required: true, message: "审批状态不能为空", trigger: "blur" },
-        ],
-        createBy: [{ required: true, message: "不能为空", trigger: "blur" }],
-        createTime: [{ required: true, message: "不能为空", trigger: "blur" }],
-        updateBy: [{ required: true, message: "不能为空", trigger: "blur" }],
-        updateTime: [{ required: true, message: "不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "删除标示不能为空", trigger: "blur" },
-        ],
-        approvePersonId: [
-          { required: true, message: "审批人不能为空", trigger: "blur" },
-        ],
-        approveTime: [
-          { required: true, message: "审批时间不能为空", trigger: "blur" },
-        ],
+        content: [{ required: true, message: "不能为空", trigger: "blur" }],
       },
       showDialog: true,
       loading: false,
       submitting: false,
+      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
     };
   },
   methods: {
@@ -184,6 +83,8 @@ export default {
           (function () {
             var id = self.formModel.id;
 
+            self.formModel.content = self.$refs.editor.getContent();
+
             if (id == null || id.length == 0) {
               return labourServicesApi.add(self.formModel);
             } else {
@@ -228,6 +129,9 @@ export default {
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
+          if (self.formModel.content != null) {
+            self.$refs.editor.setContent(self.formModel.content);
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/base/labourServices-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/labourServices">labourServices管理</a>
+        <a href="/labourServices">劳务对接管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -19,88 +19,27 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="" prop="id">
-        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
-      </el-form-item>
-      <el-form-item label="类型(我要用工人,我有工人等)" prop="type">
-        <el-input type="text" size="mini" v-model="queryModel.type"></el-input>
-      </el-form-item>
-      <el-form-item label="内容" prop="content">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.content"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="状态(上架下架等" prop="status">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.status"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="排序号" prop="sortNo">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.sortNo"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="审批状态" prop="approvalStatus">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.approvalStatus"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="createBy">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.createBy"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="createTime">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.createTime"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="updateBy">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.updateBy"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="updateTime">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.updateTime"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="删除标示" prop="delFlag">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.delFlag"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="审批人" prop="approvePersonId">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.approvePersonId"
-        ></el-input>
+      <el-form-item label="审批状态" prop="t">
+        <el-select v-model="queryModel.approvalStatus" filterable placeholder="请选择" size="mini">
+          <el-option
+            v-for="result in approvalStatusList"
+            :key="result.id"
+            :label="result.name"
+            :value="result.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="审批时间" prop="approveTime">
-        <el-input
-          type="text"
+        <el-date-picker
+          v-model="approveTimeRange"
+          type="daterange"
           size="mini"
-          v-model="queryModel.approveTime"
-        ></el-input>
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd">
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -128,16 +67,7 @@
         plain
         icon="el-icon-circle-plus"
         @click="handleAdd"
-        >新增</el-button
-      >
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        :disabled="multipleSelection.length == 0"
-        @click="handleBatchDelete"
-        >删除选中项</el-button
+        >发布信息</el-button
       >
     </el-row>
     <el-table
@@ -148,56 +78,44 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="id" label="" width="180"></el-table-column>
-      <el-table-column
-        prop="type"
-        label="类型(我要用工人,我有工人等)"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="content"
-        label="内容"
-        width="180"
-      ></el-table-column>
       <el-table-column
-        prop="status"
-        label="状态(上架下架等"
-        width="180"
+        prop="typeN"
+        label="发布类型"
+        width="120"
       ></el-table-column>
       <el-table-column
-        prop="sortNo"
-        label="排序号"
+        prop="createTime"
+        label="发布时间"
         width="180"
       ></el-table-column>
       <el-table-column
-        prop="approvalStatus"
-        label="审批状态"
-        width="180"
+        prop="content"
+        label="内容摘要"
+        width="400"
+        :show-overflow-tooltip="true"
       ></el-table-column>
-      <el-table-column prop="createBy" label="" width="180"></el-table-column>
-      <el-table-column prop="createTime" label="" width="180"></el-table-column>
-      <el-table-column prop="updateBy" label="" width="180"></el-table-column>
-      <el-table-column prop="updateTime" label="" width="180"></el-table-column>
       <el-table-column
-        prop="delFlag"
-        label="删除标示"
-        width="180"
+        prop="approvalStatusN"
+        label="审核进度"
+        width="120"
       ></el-table-column>
       <el-table-column
-        prop="approvePersonId"
-        label="审批人"
-        width="180"
+        prop="approvePersonName"
+        label="审核人"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="approveTime"
-        label="审批时间"
+        label="审核时间"
         width="180"
       ></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{ row }">
           <el-button size="mini" type="warning" @click="handleEdit(row)"
-            >编辑</el-button
+            >查看</el-button
+          >
+          <el-button size="mini" type="primary" @click="handleEdit(row)"
+            >修改</el-button
           >
           <el-button size="mini" type="danger" @click="handleDelete(row)"
             >删除</el-button
@@ -224,9 +142,10 @@
 <script>
 import Constant from "@/constant";
 import LabourServicesDetail from "./labourServices-detail";
-import labourServicesApi from "@/api/base/base/labourServices";
+import labourServicesApi from "@/api/base/labourServices";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 
 export default {
   data() {
@@ -261,8 +180,19 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
+      approveTimeRange:"",
+      approvalStatusList:[],
     };
   },
+  created() {
+
+    dataDictionaryApi.findByCatalogName({
+      "catalogName" : "劳务对接审批状态"
+    }).then(response => {
+      var jsonData = response.data;
+      this.approvalStatusList = jsonData.data;
+    });
+  },
   methods: {
     changePage(pageIndex) {
       var self = this;
@@ -275,19 +205,12 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("id", self.queryModel.id);
-      formData.append("type", self.queryModel.type);
-      formData.append("content", self.queryModel.content);
-      formData.append("status", self.queryModel.status);
-      formData.append("sortNo", self.queryModel.sortNo);
       formData.append("approvalStatus", self.queryModel.approvalStatus);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
-      formData.append("approvePersonId", self.queryModel.approvePersonId);
-      formData.append("approveTime", self.queryModel.approveTime);
+
+      if(self.approveTimeRange!=null&&self.approveTimeRange!=""){
+        formData.append("approveTimeRange", self.approveTimeRange.toString());
+      }
+      
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -331,6 +254,7 @@ export default {
     },
     handleReset(name) {
       this.$refs[name].resetFields();
+      this.approveTimeRange="";
     },
     handleAdd() {
       this.modalTitle = "新增";