瀏覽代碼

分页不展示问题

yuanmingze 5 月之前
父節點
當前提交
bfd671f171

+ 2 - 2
.env.development

@@ -1,8 +1,8 @@
 NODE_ENV = 'development'
 VUE_APP_TYPE= 'dev'
-VUE_APP_URL = 'http://10.144.62.235:9999'
+# VUE_APP_URL = 'http://10.144.62.235:9999'
 # VUE_APP_URL = 'https://mic.freerr.cn'
-# VUE_APP_URL = 'https://mic.cnbg.com.cn'
+VUE_APP_URL = 'https://mic.cnbg.com.cn'
 # VUE_APP_URL = 'https://cnbg.yaoyi.net'
 # VUE_APP_URL = 'http://192.168.110.25:9999'
 # VUE_APP_URL = 'https://mic-t.cnbg.com.cn'

+ 2 - 2
.env.production

@@ -1,6 +1,6 @@
 NODE_ENV = 'production'
 VUE_APP_TYPE= 'prod'
 # VUE_APP_URL = 'https://cnbg.yaoyi.net'
-# VUE_APP_URL = 'https://mic-t.cnbg.com.cn'
-VUE_APP_URL = 'https://mic.cnbg.com.cn'
+VUE_APP_URL = 'https://mic-t.cnbg.com.cn'
+# VUE_APP_URL = 'https://mic.cnbg.com.cn'
 

二進制
dist.zip


+ 16 - 14
src/const/crud/activiti/task.js

@@ -46,7 +46,7 @@ export const tableOption = {
       format: 'yyyy-MM-dd HH:mm'
     }
   ]
-}
+};
 export const formOption = {
   submitBtn: false,
   emptyBtn: false,
@@ -95,11 +95,11 @@ export const formOption = {
       row: true,
       span: 24,
       options: {
-        action: "/admin/sys-file/upload",
+        action: '/admin/sys-file/upload',
         props: {
-          res: "data",
-          url: "url"
-        },
+          res: 'data',
+          url: 'url'
+        }
       }
     },
     {
@@ -108,18 +108,19 @@ export const formOption = {
       type: 'textarea',
       row: true,
       span: 24,
-      rules: [{
-        required: true,
-        message: '请输入备注',
-        trigger: 'blur'
-      }]
+      rules: [
+        {
+          required: true,
+          message: '请输入备注',
+          trigger: 'blur'
+        }
+      ]
     }
   ]
-}
+};
 
 export const taskOption = {
   menu: false,
-  page: false,
   addBtn: false,
   align: 'center',
   menuAlign: 'center',
@@ -136,7 +137,8 @@ export const taskOption = {
     {
       label: '批注',
       prop: 'fullMessage'
-    }, {
+    },
+    {
       label: '操作时间',
       prop: 'time',
       type: 'datetime',
@@ -144,4 +146,4 @@ export const taskOption = {
       valueFormat: 'yyyy-MM-dd hh:mm:ss'
     }
   ]
-}
+};

+ 80 - 84
src/const/crud/missionCenter.js

@@ -1,10 +1,7 @@
-
-
 export const missionCenterData = {
-  page: false,
-  align: "center",
-  menuAlign: "center",
-  indexLabel: "序号",
+  align: 'center',
+  menuAlign: 'center',
+  indexLabel: '序号',
   index: true,
   selection: false,
   border: true,
@@ -13,53 +10,53 @@ export const missionCenterData = {
   header: false,
   editBtn: false,
   searchMenuSpan: 4,
-  searchLabelWidth: "90",
+  searchLabelWidth: '90',
   column: [
     {
-      type: "input",
-      label: "执行包名称",
-      prop: "scorePackageName",
+      type: 'input',
+      label: '执行包名称',
+      prop: 'scorePackageName',
       search: true,
       span: 24
     },
     {
-      type: "select",
-      label: "分发对象",
-      prop: "sendPackageDeptId",
+      type: 'select',
+      label: '分发对象',
+      prop: 'sendPackageDeptId',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       search: true,
       span: 13,
-      dicUrl: "/admin/wmscorepackage/selectSendPackageDeptId",
+      dicUrl: '/admin/wmscorepackage/selectSendPackageDeptId',
       props: {
-        label: "name",
-        value: "deptId"
+        label: 'name',
+        value: 'deptId'
       },
-      formatter: function(row) {
+      formatter: function (row) {
         return parseInt(row.sendPackageDeptId);
       }
     },
     {
-      label: "服务总值",
-      prop: "score",
+      label: '服务总值',
+      prop: 'score',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       span: 13
     },
     {
-      label: "执行包类型",
-      prop: "packageType1",
+      label: '执行包类型',
+      prop: 'packageType1',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
-      dicUrl: "/admin/dict/type/package_type1",
+      dicUrl: '/admin/dict/type/package_type1',
       span: 13
     },
     {
-      label: "有效服务类型",
-      prop: "taskTypes",
+      label: '有效服务类型',
+      prop: 'taskTypes',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
@@ -67,8 +64,8 @@ export const missionCenterData = {
       slot: true
     },
     {
-      label: "关联执行包",
-      prop: "relationScoreId",
+      label: '关联执行包',
+      prop: 'relationScoreId',
       hide: true,
       addDisplay: false,
       editDisplay: false,
@@ -76,26 +73,26 @@ export const missionCenterData = {
       span: 13
     },
     {
-      label: "所属月份",
-      prop: "belongDate",
-      type: "date",
+      label: '所属月份',
+      prop: 'belongDate',
+      type: 'date',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
-      format: "yyyy-MM",
-      valueFormat: "yyyy-MM",
+      format: 'yyyy-MM',
+      valueFormat: 'yyyy-MM',
       span: 13
     },
     {
-      label: "分配日期",
-      prop: "allocationDate",
+      label: '分配日期',
+      prop: 'allocationDate',
       span: 13,
-      type: "date",
+      type: 'date',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
-      format: "yyyy-MM-dd hh:mm:ss",
-      valueFormat: "yyyy-MM-dd hh:mm:ss"
+      format: 'yyyy-MM-dd hh:mm:ss',
+      valueFormat: 'yyyy-MM-dd hh:mm:ss'
       // dicUrl: '/admin/wmtaskrule/list',
       // props: {
       //   label: 'ruleMonth',
@@ -103,34 +100,34 @@ export const missionCenterData = {
       // },
     },
     {
-      type: "select",
-      label: "执行包状态",
+      type: 'select',
+      label: '执行包状态',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       span: 13,
-      prop: "packageFinishStatus",
-      dicUrl: "/admin/dict/type/package_finish_status"
+      prop: 'packageFinishStatus',
+      dicUrl: '/admin/dict/type/package_finish_status'
     },
 
     {
-      type: "input",
-      label: "完成服务分值",
+      type: 'input',
+      label: '完成服务分值',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
-      prop: "ysh",
+      prop: 'ysh',
       span: 13
     },
     {
-      label: "完成百分比",
+      label: '完成百分比',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
-      prop: "finishRate",
+      prop: 'finishRate',
       span: 13,
-      formatter: function(row) {
-        return parseInt(row.finishRate) + "%";
+      formatter: function (row) {
+        return parseInt(row.finishRate) + '%';
       }
     },
     // {
@@ -156,8 +153,8 @@ export const missionCenterData = {
     //   type: 'select'
     // },
     {
-      label: "可结算服务值",
-      prop: "ywctt",
+      label: '可结算服务值',
+      prop: 'ywctt',
       // slot:true,
       addDisplay: false,
       editDisplay: false,
@@ -169,10 +166,9 @@ export const missionCenterData = {
 
 // 查看页面
 export const missionLookdata = {
-  page: false,
-  align: "center",
-  menuAlign: "center",
-  indexLabel: "序号",
+  align: 'center',
+  menuAlign: 'center',
+  indexLabel: '序号',
   index: true,
   selection: false,
   border: true,
@@ -181,60 +177,60 @@ export const missionLookdata = {
   editBtn: false,
   header: false,
   searchMenuSpan: 4,
-  searchLabelWidth: "90",
+  searchLabelWidth: '90',
   column: [
     {
-      type: "select",
-      label: "服务类型",
-      prop: "taskTypeId",
+      type: 'select',
+      label: '服务类型',
+      prop: 'taskTypeId',
       span: 13,
-      dicUrl: "/admin/wmtasktype/list",
+      dicUrl: '/admin/wmtasktype/list',
       props: {
-        label: "taskTypeName",
-        value: "id"
+        label: 'taskTypeName',
+        value: 'id'
       }
     },
     {
-      type: "input",
-      label: "服务积分",
-      prop: "score",
+      type: 'input',
+      label: '服务积分',
+      prop: 'score',
       span: 24
     },
     {
-      type: "input",
-      label: "推广员名称",
-      prop: "taskUsername"
+      type: 'input',
+      label: '推广员名称',
+      prop: 'taskUsername'
     },
     {
-      label: "完成时间",
-      prop: "lookintoDate",
+      label: '完成时间',
+      prop: 'lookintoDate',
       span: 13,
-      type: "datetime",
-      format: "yyyy-MM-dd HH:mm:ss",
-      valueFormat: "yyyy-MM-dd HH:mm:ss"
+      type: 'datetime',
+      format: 'yyyy-MM-dd HH:mm:ss',
+      valueFormat: 'yyyy-MM-dd HH:mm:ss'
     },
     {
-      label: "审核状态",
-      prop: "taskStatus",
+      label: '审核状态',
+      prop: 'taskStatus',
       span: 13,
-      type: "select",
-      dicUrl: "/admin/dict/type/task_status"
+      type: 'select',
+      dicUrl: '/admin/dict/type/task_status'
     },
     {
-      type: "input",
-      label: "执行包名称",
-      prop: "scorePackageName",
+      type: 'input',
+      label: '执行包名称',
+      prop: 'scorePackageName',
       span: 13
     },
 
     {
-      type: "select",
-      label: "服务提供商",
-      prop: "deptId",
-      dicUrl: "/admin/dept/list",
+      type: 'select',
+      label: '服务提供商',
+      prop: 'deptId',
+      dicUrl: '/admin/dept/list',
       props: {
-        label: "name",
-        value: "dept_id"
+        label: 'name',
+        value: 'dept_id'
       }
     }
     // {

+ 31 - 32
src/const/crud/points.js

@@ -1,8 +1,7 @@
 export const pointsData = {
-  page: false,
-  align: "center",
-  menuAlign: "center",
-  indexLabel: "序号",
+  align: 'center',
+  menuAlign: 'center',
+  indexLabel: '序号',
   index: true,
   selection: false,
   border: true,
@@ -12,61 +11,61 @@ export const pointsData = {
   viewBtn: false,
   menuLeft: true,
   searchMenuSpan: 5,
-  searchLabelWidth: "90",
+  searchLabelWidth: '90',
   menuWidth: 200,
-  labelWidth: "130",
-  needVal: "",
+  labelWidth: '130',
+  needVal: '',
   column: [
     {
-      type: "input",
-      label: "执行包名称",
-      prop: "scorePackageName",
+      type: 'input',
+      label: '执行包名称',
+      prop: 'scorePackageName',
       searchSpan: 6,
       search: true
     },
     {
-      label: "执行包总值",
-      prop: "score"
+      label: '执行包总值',
+      prop: 'score'
     },
     {
-      type: "select",
-      label: "承接对象",
-      prop: "acceptSug",
+      type: 'select',
+      label: '承接对象',
+      prop: 'acceptSug',
       search: true,
       searchSpan: 8,
-      dicUrl: "/admin/wmdaagent/listCso",
+      dicUrl: '/admin/wmdaagent/listCso',
       props: {
-        label: "gsmc",
-        value: "id"
+        label: 'gsmc',
+        value: 'id'
       },
-      formatter: function(row) {
+      formatter: function (row) {
         return Number(row.acceptSug);
       }
     },
 
     {
-      type: "select",
-      label: "执行包状态",
-      prop: "packageFinishStatus",
-      dicUrl: "/admin/dict/type/package_finish_status"
+      type: 'select',
+      label: '执行包状态',
+      prop: 'packageFinishStatus',
+      dicUrl: '/admin/dict/type/package_finish_status'
     },
     {
-      label: "分配日期",
-      prop: "allocationDate",
+      label: '分配日期',
+      prop: 'allocationDate',
       searchSpan: 10,
       search: true,
       searchslot: true
     },
     {
-      type: "input",
-      label: "完成分值",
-      prop: "ysh"
+      type: 'input',
+      label: '完成分值',
+      prop: 'ysh'
     },
     {
-      label: "完成百分比",
-      prop: "finishRate",
-      formatter: function(row) {
-        return Number(row.finishRate) + "%";
+      label: '完成百分比',
+      prop: 'finishRate',
+      formatter: function (row) {
+        return Number(row.finishRate) + '%';
       }
     }
   ]

+ 60 - 62
src/const/crud/reportRule.js

@@ -1,8 +1,7 @@
 export const reportRuledata = {
-  page: false,
-  align: "center",
-  menuAlign: "center",
-  indexLabel: "序号",
+  align: 'center',
+  menuAlign: 'center',
+  indexLabel: '序号',
   index: true,
   selection: false,
   border: true,
@@ -11,68 +10,68 @@ export const reportRuledata = {
   header: false,
   editBtn: false,
   searchMenuSpan: 5,
-  searchLabelWidth: "90",
+  searchLabelWidth: '90',
   // delBtn:true,
   column: [
     {
-      type: "input",
-      label: "报告ID",
-      prop: "reportNo",
+      type: 'input',
+      label: '报告ID',
+      prop: 'reportNo',
       search: true,
       searchSpan: 8
     },
     {
-      type: "input",
-      label: "执行包名称",
-      prop: "scorePackageName",
+      type: 'input',
+      label: '执行包名称',
+      prop: 'scorePackageName',
       // slot: true,
       search: true,
       searchSpan: 8,
       span: 13
     },
     {
-      label: "服务数",
-      prop: "taskNumber",
+      label: '服务数',
+      prop: 'taskNumber',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       span: 13
     },
     {
-      label: "完成积分值",
+      label: '完成积分值',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
-      prop: "totalScore",
+      prop: 'totalScore',
       span: 13
     },
     {
-      type: "input",
-      label: "派工方",
-      prop: "entName"
+      type: 'input',
+      label: '派工方',
+      prop: 'entName'
     },
     {
-      label: "生成日期",
-      prop: "createTime",
+      label: '生成日期',
+      prop: 'createTime',
       span: 13,
-      type: "date",
+      type: 'date',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
-      format: "yyyy-MM-dd hh:mm:ss",
-      valueFormat: "yyyy-MM-dd hh:mm:ss"
+      format: 'yyyy-MM-dd hh:mm:ss',
+      valueFormat: 'yyyy-MM-dd hh:mm:ss'
     },
     {
-      type: "select",
-      label: "报告状态",
+      type: 'select',
+      label: '报告状态',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       searchSpan: 8,
       search: true,
-      prop: "reportStatus",
+      prop: 'reportStatus',
       span: 13,
-      dicUrl: "/admin/dict/type/report_status"
+      dicUrl: '/admin/dict/type/report_status'
       // props: {
       //   label: 'realname',
       //   value: 'id'
@@ -93,10 +92,9 @@ export const reportRuledata = {
 };
 
 export const reportRulelookdata = {
-  page: false,
-  align: "center",
-  menuAlign: "center",
-  indexLabel: "序号",
+  align: 'center',
+  menuAlign: 'center',
+  indexLabel: '序号',
   index: true,
   selection: false,
   border: true,
@@ -105,22 +103,22 @@ export const reportRulelookdata = {
   editBtn: false,
   header: false,
   searchMenuSpan: 4,
-  searchLabelWidth: "90",
+  searchLabelWidth: '90',
   column: [
     {
-      label: "服务类型",
-      prop: "taskTypeId",
+      label: '服务类型',
+      prop: 'taskTypeId',
       span: 13,
-      dicUrl: "/admin/wmtasktype/list",
+      dicUrl: '/admin/wmtasktype/list',
       props: {
-        label: "taskTypeName",
-        value: "id"
+        label: 'taskTypeName',
+        value: 'id'
       }
     },
     {
-      type: "input",
-      label: "服务积分",
-      prop: "score",
+      type: 'input',
+      label: '服务积分',
+      prop: 'score',
       span: 24
       // dicUrl: '/admin/wmtasktype/list',
       // props: {
@@ -129,17 +127,17 @@ export const reportRulelookdata = {
       // }
     },
     {
-      type: "input",
-      label: "推广员名称",
-      prop: "taskUsername"
+      type: 'input',
+      label: '推广员名称',
+      prop: 'taskUsername'
     },
     {
-      label: "完成时间",
-      prop: "lookintoDate",
+      label: '完成时间',
+      prop: 'lookintoDate',
       span: 13,
-      type: "datetime",
-      format: "yyyy-MM-dd HH:mm:ss",
-      valueFormat: "yyyy-MM-dd HH:mm:ss"
+      type: 'datetime',
+      format: 'yyyy-MM-dd HH:mm:ss',
+      valueFormat: 'yyyy-MM-dd HH:mm:ss'
     },
     // {
     //   "label": "服务状态",
@@ -149,23 +147,23 @@ export const reportRulelookdata = {
     //   dicUrl: '/admin/dict/type/task_status',
     // },
     {
-      label: "报告审核状态",
-      prop: "reportApprovalOpinion",
+      label: '报告审核状态',
+      prop: 'reportApprovalOpinion',
       dicData: [
         {
-          label: "通过",
-          value: "1"
+          label: '通过',
+          value: '1'
         },
         {
-          label: "不通过",
-          value: "2"
+          label: '不通过',
+          value: '2'
         }
       ],
       slot: true
     },
     {
-      label: "报告ID",
-      prop: "reportNo",
+      label: '报告ID',
+      prop: 'reportNo',
       span: 13
     },
 
@@ -184,13 +182,13 @@ export const reportRulelookdata = {
     //   span: 13
     // },
     {
-      type: "select",
-      label: "所属组织",
-      prop: "deptId",
-      dicUrl: "/admin/dept/list",
+      type: 'select',
+      label: '所属组织',
+      prop: 'deptId',
+      dicUrl: '/admin/dept/list',
       props: {
-        label: "name",
-        value: "dept_id"
+        label: 'name',
+        value: 'dept_id'
       }
     }
     // {

+ 1 - 2
src/const/crud/riskEventAudit.js

@@ -1,5 +1,4 @@
 export const tableOption = {
-  page: false,
   align: 'center',
   menuAlign: 'center',
   indexLabel: '序号',
@@ -45,7 +44,7 @@ export const tableOption = {
       prop: 'total',
       width: '130px',
 
-      formatter: function(row) {
+      formatter: function (row) {
         return Number(row.taskSupStat.supTotal) + ' / ' + Number(row.taskSupStat.total);
       }
     },

+ 0 - 2
src/const/crud/teskReportapproval.js

@@ -2,7 +2,6 @@ import store from '@/store';
 
 const roles = store.getters.userInfo.roles;
 export const teskReportapprovaldata = {
-  page: false,
   align: 'center',
   menuAlign: 'center',
   indexLabel: '序号',
@@ -101,7 +100,6 @@ export const teskReportapprovaldata = {
 };
 
 export const teskReportapprovalLookdata = {
-  page: false,
   align: 'center',
   menuAlign: 'center',
   indexLabel: '序号',

+ 1 - 1
src/views/serviceManagement/servicesToBeReviewed/index.vue

@@ -89,7 +89,7 @@
 
     <div class="check-btns">
       <el-button type="primary" @click="allClick">批量审核</el-button>
-      <el-button type="primary" @click="quickAuditClick">快捷审核</el-button>
+      <!-- <el-button type="primary" @click="quickAuditClick">快捷审核</el-button> -->
     </div>
     <div class="tips">当前表格已选择{{ totalNum }}项,总积分:{{ totalScore }}</div>
 

+ 6 - 9
src/views/tx/index.vue

@@ -1,14 +1,12 @@
 <template>
   <div class="execution">
     <basic-container>
-      <avue-crud
-        :data="data"
-        :option="option"/>
+      <avue-crud :data="data" :option="option" />
     </basic-container>
   </div>
 </template>
 <script>
-import request from '@/router/axios'
+import request from '@/router/axios';
 
 export default {
   data() {
@@ -17,7 +15,6 @@ export default {
       data: [],
       option: {
         menu: false,
-        page: false,
         addBtn: false,
         align: 'center',
         menuAlign: 'center',
@@ -32,15 +29,15 @@ export default {
           }
         ]
       }
-    }
+    };
   },
   created() {
     request({
       url: '/tx/admin/avueSetting',
       method: 'get'
     }).then((resp) => {
-      this.data = resp.data
-    })
+      this.data = resp.data;
+    });
   }
-}
+};
 </script>

+ 6 - 7
src/views/tx/model.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="execution">
     <basic-container>
-      <avue-crud :data="data" :option="option"/>
+      <avue-crud :data="data" :option="option" />
     </basic-container>
   </div>
 </template>
 <script>
-import request from '@/router/axios'
+import request from '@/router/axios';
 
 export default {
   data() {
@@ -15,7 +15,6 @@ export default {
       data: [],
       option: {
         menu: false,
-        page: false,
         addBtn: false,
         align: 'center',
         menuAlign: 'center',
@@ -38,15 +37,15 @@ export default {
           }
         ]
       }
-    }
+    };
   },
   created() {
     request({
       url: '/tx/admin/onlines',
       method: 'get'
     }).then((resp) => {
-      this.data = resp.data
-    })
+      this.data = resp.data;
+    });
   }
-}
+};
 </script>