qukaidi 3 vuotta sitten
vanhempi
commit
49c249f592

+ 28 - 0
src/router/views/index.js

@@ -1723,4 +1723,32 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/warehousing/goodsTransfer/index')
   }]
 },
+{
+  path: '/statisticAnalysis/taskStatistics/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/statisticAnalysis/taskStatistics/index',
+    name: '任务统计',
+    meta: {
+      i18n: '/statisticAnalysis/taskStatistics/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/taskStatistics/index')
+  }]
+},
+{
+  path: '/statisticAnalysis/commissionStatistics/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/statisticAnalysis/commissionStatistics/index',
+    name: '提成统计(S)',
+    meta: {
+      i18n: '/statisticAnalysis/commissionStatistics/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/commissionStatistics/index')
+  }]
+},
 ]

+ 1 - 1
src/views/workManagement/handoverSheet/index.vue

@@ -42,7 +42,7 @@
             icon="el-icon-delete"
             size="small"
             @click.stop="rowDel(scope.row, scope.index)"
-            :disabled="scope.row.status == 3 || scope.row.confirmStatus === 1"
+            :disabled="scope.row.status > 0 || scope.row.confirmStatus === 1"
           >删除
           </el-button>
         </template>

+ 24 - 67
src/views/workManagement/purchaseApply/index.vue

@@ -1,77 +1,35 @@
 <template>
   <div>
     <basic-container v-show="show" class="page-crad">
-      <avue-crud
-        ref="crud"
-        :option="option"
-        :data="dataList"
-        v-model="form"
-        :page.sync="page"
-        :search.sync="search"
-        :table-loading="loading"
-        :cell-style="cellStyle"
-        @selection-change="selectionChange"
-        @search-change="searchChange"
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        @refresh-change="refreshChange"
-        @on-load="onLoad"
-        @search-criteria-switch="searchCriteriaSwitch"
-        @saveColumn="saveColumn"
-        @resetColumn="resetColumn"
-      >
+      <avue-crud ref="crud" :option="option" :data="dataList" v-model="form" :page.sync="page" :search.sync="search"
+        :table-loading="loading" :cell-style="cellStyle" @selection-change="selectionChange"
+        @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
+        @refresh-change="refreshChange" @on-load="onLoad" @search-criteria-switch="searchCriteriaSwitch"
+        @saveColumn="saveColumn" @resetColumn="resetColumn">
         <template slot="menuLeft">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="small"
-            @click.stop="newAdd()"
-          >创建单据</el-button>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-plus"
-            @click.stop="copyDoc()"
-            :disabled="selection.length != 1"
-            v-if="false"
-          >复制单据</el-button>
+          <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newAdd()">创建单据</el-button>
+          <el-button type="success" size="small" icon="el-icon-plus" @click.stop="copyDoc()"
+            :disabled="selection.length != 1" v-if="false">复制单据</el-button>
         </template>
         <template slot-scope="scope" slot="menu">
-          <el-button
-            type="text"
-            icon="el-icon-delete"
-            size="small"
-            @click.stop="rowDel(scope.row, scope.index)"
-            :disabled="scope.row.status == 3"
-          >删除
+          <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(scope.row, scope.index)"
+            :disabled="scope.row.status != 0">删除
           </el-button>
         </template>
         <template slot="applyUserNameSearch">
-          <el-select
-            v-model="search.applyUser"
-            filterable
-            clearable
-            size="small"
-          >
-            <el-option
-              v-for="(item,index) in userList"
-              :key="index"
-              :label="item.realName"
-              :value="item.id"
-            ></el-option>
+          <el-select v-model="search.applyUser" filterable clearable size="small">
+            <el-option v-for="(item, index) in userList" :key="index" :label="item.realName" :value="item.id">
+            </el-option>
           </el-select>
         </template>
         <template slot="applyUserName" slot-scope="scope">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.applyUserName }}</span>
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
+              scope.row.applyUserName
+          }}</span>
         </template>
       </avue-crud>
     </basic-container>
-    <detail-page
-      @goBack="goBack"
-      @copyOrder="copyOrder"
-      :detailData="detailData"
-      v-if="!show"
-    />
+    <detail-page @goBack="goBack" @copyOrder="copyOrder" :detailData="detailData" v-if="!show" />
   </div>
 </template>
 
@@ -79,7 +37,7 @@
 import option from "./config/mainList.json";
 import detailPage from "./detail";
 import { gainUser } from "@/api/basicData/customerInquiry";
-import {getList, deleteList} from "@/api/officeSupplies/purchaseApply";
+import { getList, deleteList } from "@/api/officeSupplies/purchaseApply";
 
 export default {
   name: "index",
@@ -114,7 +72,7 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 3 !== 0){
+    if (i % 3 !== 0) {
       const num = 3 - Number(i % 3)
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
@@ -154,10 +112,10 @@ export default {
   },
   methods: {
     searchCriteriaSwitch(type) {
-      if (type){
-        this.option.height =  this.option.height - 90
-      }else {
-        this.option.height =  this.option.height + 90
+      if (type) {
+        this.option.height = this.option.height - 90
+      } else {
+        this.option.height = this.option.height + 90
       }
       this.$refs.crud.getTableHeight()
     },
@@ -238,7 +196,7 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
-    copyDoc() {},
+    copyDoc() { },
     selectionChange(list) {
       this.selection = list;
     },
@@ -296,5 +254,4 @@ export default {
 </script>
 
 <style scoped>
-
 </style>

+ 1 - 1
src/views/workManagement/requisition/index.vue

@@ -42,7 +42,7 @@
             icon="el-icon-delete"
             size="small"
             @click.stop="rowDel(scope.row, scope.index)"
-            :disabled="scope.row.status == 3"
+            :disabled="scope.row.status !=0"
           >删除
           </el-button>
         </template>

+ 8 - 1
src/views/workManagement/task/configuration/mainList.json

@@ -11,7 +11,7 @@
   "height": "auto",
   "searchIcon": true,
   "searchIndex": 2,
-  "searchMenuSpan": 16,
+  "searchMenuSpan": 8,
   "tree": true,
   "selection": false,
   "addBtn": false,
@@ -97,6 +97,13 @@
       "searchOrder": 1
     },
     {
+      "label": "业务单号",
+      "search": true,
+      "prop": "sysNo",
+      "overHidden": true,
+      "width": 140
+    },
+    {
       "label": "服务项目",
       "prop": "pname",
       "search": true,