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

public/chengdu/js/detail.js

@@ -1,6 +1,6 @@
 //var baseUrl = 'http://cgsu81beft.51xd.pub';
 var baseUrl = "http://39.101.167.152:8088/shekecaiji";
-var testUrl = "http://192.168.3.108:8000/jobslink-api/jkworksreport"
+var testUrl = "http://192.168.3.104:8000/jobslink-api/jkworksreport"
 
 var href = window.location.href.split("=");
 var shengFen = unescape(href[1].split("&")[0]);

public/chengdu/js/index.js

@@ -1,6 +1,6 @@
 //var baseUrl = 'http://cgsu81beft.51xd.pub';
 var baseUrl = "http://39.101.167.152:8088/shekecaiji";
-var testUrl = "http://192.168.3.108:8000/jobslink-api/jkworksreport"
+var testUrl = "http://192.168.3.104:8000/jobslink-api/jkworksreport"
 
 console.log(document.cookie)
 // 获取cookie

src/common/dic.js

@@ -27,12 +27,13 @@ export const timeStatus = [
   { value: 2, label: "截止时间" },
 ];
 export const jobStatus = [
-  { value: "", label: "全部" },
+  // { value: "", label: "全部" },
+  { value: 9, label: "审核未通过" },
   { value: 1, label: "招聘中" },
-  { value: 2, label: "任务中" },
+  // { value: 2, label: "任务中" },
   { value: 3, label: "已完成" },
   { value: 4, label: "已失效" },
-  { value: 9, label: "审核未通过" },
+  
 ];
 export const bondState = [
   { value: "", label: "全部" },

src/views/manage/mission/count/table/detail.vue

@@ -58,16 +58,17 @@ export default {
   filters: {
     jobStatus (v) {
       switch (v) {
+        case 9:
+          return '审核未通过'
         case 1:
           return '招聘中'
-        case 2:
+        // case 2:
-          return '任务中'
+        //   return '任务中'
         case 3:
           return '已完成'
         case 4:
           return '已失效'
-        case 9:
+        
-          return '审核未通过'
       }
     }
   },
@@ -89,7 +90,7 @@ export default {
         menuWidth: 120,
         align: "center",
         menuAlign: "center",
-        indexLabel: "序号",
+        // indexLabel: "序号",
         menu:true,
         tip: false,
         addBtn: false,
@@ -101,13 +102,17 @@ export default {
         searchBtn: false,
         searchShow: false,
         border: true,
-        index: true,
+        index: false,
         selection: false,
         dialogType: "drawer",
         dialogWidth: "60%",
         delBtnText: "取消",
         dialogClickModal: false,
         column: [
+          {
+            label: "社区街道名称",
+            prop: "companyName",
+          },
           {
             label: "任务标题",
             prop: "missionTitle",
@@ -117,10 +122,6 @@ export default {
             prop: "missionNo",
             display: false,
           },
-          {
-            label: "社区街道名称",
-            prop: "companyName",
-          },
           {
             label: "任务状态",
             prop: "status",

src/views/manage/mission/count/table/gather.vue

@@ -56,7 +56,7 @@ export default {
         menuWidth: 120,
         align: "center",
         menuAlign: "center",
-        indexLabel: "序号",
+        // indexLabel: "序号",
         menu:true,
         tip: false,
         addBtn: false,
@@ -68,7 +68,7 @@ export default {
         searchBtn: false,
         searchShow: false,
         border: true,
-        index: true,
+        index: false,
         selection: false,
         dialogType: "drawer",
         dialogWidth: "60%",

src/views/manage/mission/index.vue

@@ -29,6 +29,8 @@
             clearable
           ></el-input>
         </el-form-item>
+      </el-row>
+      <el-row :span="24">
         <el-form-item>
           <el-select v-model="query.type" placeholder="请选择搜索时间类型">
             <el-option label="任务开始日期" :value="0"></el-option>

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

@@ -1135,8 +1135,8 @@ export default {
         if(type!='edit'){
           getLastTaskInfo().then(res=>{
             const data=res.data.data;
-            this.obj.callName=data.callName;
+            // this.obj.callName=data.callName;
-            this.obj.callTel=data.callTel;
+            // this.obj.callTel=data.callTel;
           })
         }
 

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

@@ -56,7 +56,7 @@
         <el-button type="text" size="mini" @click="employ(row, 1)">录用登记</el-button>
         <el-button icon="el-icon-view" :size="size" :type="type" @click.stop="rowView(row)"
           v-show="vaildData(permission.tenant_mission_view, false)">查看</el-button>
-        <save-button icon="el-icon-check" :size="size" :type="type" @click="rowCopy(row, 'copy')">复制</save-button>
+        <!-- <save-button icon="el-icon-check" :size="size" :type="type" @click="rowCopy(row, 'copy')">复制</save-button> -->
         <el-button icon="el-icon-edit" :size="size" :type="type" @click="rowCopy(row, 'edit')"
           :disabled="row.signUpCount !== 0" v-show="vaildData(permission.tenant_mission_edit, false)">编辑</el-button>
         <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row)"

src/views/tenant/mission/index.vue

@@ -97,16 +97,15 @@
           status: 1
         },
         timeScreenTerm:[{
-          value: 1,
-          label: '报名截止日期',
-        },
-          {
             value: 2,
-            label: '开始日期',
+            label: '任务开始日期',
           },
           {
             value: 3,
-            label: '完成日期',
+            label: '任务结束日期',
+          }, {
+            value: 1,
+            label: '报名截止日期',
           }],
       }
     },

vue.config.js

@@ -23,10 +23,10 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        // target: 'http://192.168.3.104:8000', // 本地服务接口地址
+        target: 'http://192.168.3.104:8000', // 本地服务接口地址
         // target: "http://39.98.184.58:8000",  // 阿里云后台地址
         // target: "http://192.168.3.108:8000",  // 本地
-        target: 'http://192.168.3.111:8000',
+        // target: 'http://192.168.3.111:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {