hfxc226 3 years ago
parent
commit
b803776498
94 changed files with 149 additions and 15287 deletions
  1. 11 0
      src/components/tools/UserMenu.vue
  2. 7 0
      src/layouts/BasicLayout.vue
  3. 0 57
      src/router/generator-platform-routers.js
  4. 2 2
      src/utils/dict.js
  5. 2 2
      src/views/Login.vue
  6. 95 80
      src/views/check/checkjob/CheckJob.vue
  7. 0 16
      src/views/dz/InStoreFormDZ.vue
  8. 0 17
      src/views/dz/OutStoreFormDZ.vue
  9. 0 17
      src/views/dz/SpareBackFormDZ.vue
  10. 0 17
      src/views/dz/SparePickFormDZ.vue
  11. 0 17
      src/views/dz/TransferStoreFormDZ.vue
  12. 0 138
      src/views/form/BasicForm.vue
  13. 0 331
      src/views/form/advancedForm/AdvancedForm.vue
  14. 0 119
      src/views/form/advancedForm/RepositoryForm.vue
  15. 0 107
      src/views/form/advancedForm/TaskForm.vue
  16. 0 112
      src/views/form/stepForm/Step1.vue
  17. 0 110
      src/views/form/stepForm/Step2.vue
  18. 0 69
      src/views/form/stepForm/Step3.vue
  19. 0 62
      src/views/form/stepForm/StepForm.vue
  20. 0 135
      src/views/list/CardList.vue
  21. 0 50
      src/views/list/QueryList.vue
  22. 0 168
      src/views/list/StandardList.vue
  23. 0 280
      src/views/list/TableList.vue
  24. 0 67
      src/views/list/modules/CreateForm.vue
  25. 0 172
      src/views/list/modules/StepByStepModal.vue
  26. 0 79
      src/views/list/modules/TaskForm.vue
  27. 0 186
      src/views/list/search/Applications.vue
  28. 0 185
      src/views/list/search/Article.vue
  29. 0 168
      src/views/list/search/Projects.vue
  30. 0 78
      src/views/list/search/SearchLayout.vue
  31. 0 160
      src/views/list/table/Edit.vue
  32. 0 240
      src/views/list/table/List.vue
  33. 0 444
      src/views/mobile/AnalysisLiquidate.vue
  34. 0 35
      src/views/monthly/sb-three-rate/MonthlySbThreeRateView.vue
  35. 0 177
      src/views/monthly/sb-three-rate/modules/BaseForm.vue
  36. 0 75
      src/views/monthly/sb-three-rate/modules/Detail.vue
  37. 0 276
      src/views/monthly/sb-three-rate/modules/MonthlySbThreeRate.vue
  38. 0 233
      src/views/monthly/sb-three-rate/modules/MonthlySbThreeRateChart.vue
  39. 0 288
      src/views/monthly/sb-three-rate/modules/MonthlySbThreeRateSelectModal.vue
  40. 0 36
      src/views/other/IconSelectorView.vue
  41. 0 272
      src/views/other/PermissionList.vue
  42. 0 182
      src/views/other/RoleList.vue
  43. 0 268
      src/views/other/TableInnerEditList.vue
  44. 0 192
      src/views/other/TreeList.vue
  45. 0 265
      src/views/other/UserList.vue
  46. 0 100
      src/views/other/modules/OrgModal.vue
  47. 0 147
      src/views/other/modules/RoleModal.vue
  48. 0 343
      src/views/profile/advanced/Advanced.vue
  49. 0 255
      src/views/profile/basic/Index.vue
  50. 4 1
      src/views/sb/info/SbInfo.vue
  51. 20 1
      src/views/sb/info/modules/BaseForm.vue
  52. 8 4
      src/views/sb/info/modules/Detail.vue
  53. 0 2
      src/views/sb/info/modules/DetailBak.vue
  54. 0 2
      src/views/sb/info/modules/DetailMeasureRelation.vue
  55. 0 2
      src/views/sb/measure/modules/Detail.vue
  56. 0 24
      src/views/sb/oil/AdminSbOil.vue
  57. 0 24
      src/views/sb/oil/MySbOil.vue
  58. 0 350
      src/views/sb/oil/SbOil.vue
  59. 0 417
      src/views/sb/oil/SbOilAudit.vue
  60. 0 424
      src/views/sb/oil/SbOilTask.vue
  61. 0 333
      src/views/sb/oil/SbOilUser.vue
  62. 0 24
      src/views/sb/oil/ZGSbOil.vue
  63. 0 237
      src/views/sb/oil/modules/AuditBaseForm.vue
  64. 0 121
      src/views/sb/oil/modules/AuditBaseFormList.vue
  65. 0 88
      src/views/sb/oil/modules/BaseForm.vue
  66. 0 296
      src/views/sb/oil/modules/BaseFormList.vue
  67. 0 101
      src/views/sb/oil/modules/ConfirmBaseForm.vue
  68. 0 101
      src/views/sb/oil/modules/Detail.vue
  69. 0 220
      src/views/sb/oil/modules/ExecuteBaseForm.vue
  70. 0 95
      src/views/sb/oil/modules/ExecuteBaseFormList.vue
  71. 0 261
      src/views/sb/oil/modules/OilAddForm.vue
  72. 0 420
      src/views/sb/oil/modules/SbOilPageBase.vue
  73. 0 406
      src/views/sb/oil/modules/SbOilPageTable.vue
  74. 0 311
      src/views/sb/oil/modules/SbOilSelectModal.vue
  75. 0 2
      src/views/sb/scrap/modules/Detail.vue
  76. 0 2
      src/views/sb/scrap/modules/DetailAuditScrap.vue
  77. 0 445
      src/views/test/BaseFormBak.vue
  78. 0 235
      src/views/ticket/ticket/Ticket.vue
  79. 0 152
      src/views/ticket/ticket/modules/BaseForm.vue
  80. 0 69
      src/views/ticket/ticket/modules/Detail.vue
  81. 0 281
      src/views/ticket/ticket/modules/TicketSelectModal.vue
  82. 0 363
      src/views/ticket/ticketexecute/TicketExecute.vue
  83. 0 516
      src/views/ticket/ticketexecute/modules/BaseForm.vue
  84. 0 134
      src/views/ticket/ticketexecute/modules/Detail.vue
  85. 0 409
      src/views/ticket/ticketexecute/modules/TicketExecuteSelectModal.vue
  86. 0 243
      src/views/ticket/ticketsafe/TicketSafe.vue
  87. 0 172
      src/views/ticket/ticketsafe/modules/BaseForm.vue
  88. 0 73
      src/views/ticket/ticketsafe/modules/Detail.vue
  89. 0 289
      src/views/ticket/ticketsafe/modules/TicketSafeSelectModal.vue
  90. 0 247
      src/views/ticket/ticketsafeexecute/TicketSafeExecute.vue
  91. 0 181
      src/views/ticket/ticketsafeexecute/modules/BaseForm.vue
  92. 0 75
      src/views/ticket/ticketsafeexecute/modules/Detail.vue
  93. 0 293
      src/views/ticket/ticketsafeexecute/modules/TicketSafeExecuteSelectModal.vue
  94. 0 12
      src/views/workplace/backlog/WorkplaceBacklog.vue

+ 11 - 0
src/components/tools/UserMenu.vue

@@ -26,6 +26,17 @@
           </a-menu-item>
         </a-menu>
       </a-dropdown>-->
+      <side-menu
+        mode="inline"
+        :menus="mobileMenus"
+        :theme="navTheme"
+        :collapsed="false"
+        :collapsible="true"
+        @menuSelect="menuSelect"
+      ></side-menu>
+      <v-for>
+
+      </v-for>
       <a-dropdown>
         <span class="action ant-dropdown-link user-dropdown-menu">
           <a-avatar class="avatar" size="small" :src="avatar"/>

+ 7 - 0
src/layouts/BasicLayout.vue

@@ -269,4 +269,11 @@ export default {
     -webkit-transform: scale(1.1);
     transform: scale(1.1);
   }
+
+  .ant-pro-multi-tab{
+    margin-left: 0px !important;
+  }
+  .ant-tabs-bar{
+    padding-left: 0px !important;
+  }
 </style>

+ 0 - 57
src/router/generator-platform-routers.js

@@ -17,23 +17,6 @@ const constantRouterComponents = {
   '404': () => import(/* webpackChunkName: "error" */ '@/views/exception/404'),
   '500': () => import(/* webpackChunkName: "error" */ '@/views/exception/500'),
   'IndexView': () => import(/* webpackChunkName: "error" */ '@/views/index/Index'),
-
-  // form
-  'BasicForm': () => import('@/views/form/BasicForm'),
-  'StepForm': () => import('@/views/form/stepForm/StepForm'),
-  'AdvanceForm': () => import('@/views/form/advancedForm/AdvancedForm'),
-
-  // list
-  'TableList': () => import('@/views/list/TableList'),
-  'StandardList': () => import('@/views/list/StandardList'),
-  'CardList': () => import('@/views/list/CardList'),
-  'SearchLayout': () => import('@/views/list/search/SearchLayout'),
-  'SearchArticles': () => import('@/views/list/search/Article'),
-  'SearchProjects': () => import('@/views/list/search/Projects'),
-  'SearchApplications': () => import('@/views/list/search/Applications'),
-  'ProfileBasic': () => import('@/views/profile/basic/Index'),
-  'ProfileAdvanced': () => import('@/views/profile/advanced/Advanced'),
-
   // upms
   'Dept': () => import('@/views/upms/dept/Dept'),
   'User': () => import('@/views/upms/user/User'),
@@ -58,15 +41,8 @@ const constantRouterComponents = {
   // account
   'AccountCenter': () => import('@/views/account/center/Index'),
   'AccountSettings': () => import('@/views/account/settings/Index'),
-
   // 其他组件
-  'IconSelectorView': () => import('@/views/other/IconSelectorView'),
-  'TreeList': () => import('@/views/other/TreeList'),
-  'TableInnerEditList': () => import('@/views/other/TableInnerEditList'),
-  'UserList': () => import('@/views/other/UserList'),
-  'RoleList': () => import('@/views/other/RoleList'),
   'SystemRoleList': () => import('@/views/role/RoleList'),
-  'PermissionList': () => import('@/views/other/PermissionList'),
   // 设备类型
   'SbType': () => import('@/views/sb/type/SbType'),
   // 设备位置
@@ -194,13 +170,6 @@ const constantRouterComponents = {
   'RepairReason': () => import('@/views/repair/repair-reason/RepairReason'),
   // 生产商
   'FirmProducer': () => import('@/views/firm/producer/FirmProducer'),
-  // 报表管理
-  'MonthlySbThreeRate': () => import('@/views/monthly/sb-three-rate/MonthlySbThreeRateView'),
-  // 工作票管理
-  'Ticket': () => import('@/views/ticket/ticket/Ticket'),
-  'TicketSafe': () => import('@/views/ticket/ticketsafe/TicketSafe'),
-  'TicketExecute': () => import('@/views/ticket/ticketexecute/TicketExecute'),
-  'TicketSafeExecute': () => import('@/views/ticket/ticketsafeexecute/TicketSafeExecute'),
   // 日常管理
   'FillInfo': () => import('@/views/fill/info/FillInfo'),
   'FillGather': () => import('@/views/fill/gather/FillGather'),
@@ -255,12 +224,6 @@ const constantRouterComponents = {
   'FgsZgSbAllocateApply': () => import('@/views/sb/allocate-apply/FgsZgSbAllocateApply'),
   // 调拨审批
   'SbAllocateTaskAudit': () => import('@/views/sb/allocate-task/SbAllocateTaskAudit'),
-  'SbOilUser': () => import('@/views/sb/oil/SbOilUser'),
-  'SbOilTask': () => import('@/views/sb/oil/SbOilTask'),
-  'SbOilAudit': () => import('@/views/sb/oil/SbOilAudit'),
-  'MySbOil': () => import('@/views/sb/oil/MySbOil'),
-  'ZGSbOil': () => import('@/views/sb/oil/ZGSbOil'),
-  'AdminSbOil': () => import('@/views/sb/oil/AdminSbOil'),
   // 我的功能
   'ProjectStore': () => import('@/views/store/store/ProjectStore'),
   'CompanyStore': () => import('@/views/store/store/CompanyStore'),
@@ -312,13 +275,6 @@ const constantRouterComponents = {
   // 导入
   'Imp': () => import('@/views/upms/impExcel/Imp'),
 
-  // 低值易耗品管理
-  'InStoreFormDZ': () => import('@/views/dz/InStoreFormDZ'), // 入库登记单
-  'OutStoreFormDZ': () => import('@/views/dz/OutStoreFormDZ'), // 出库登记单
-  'TransferStoreFormDZ': () => import('@/views/dz/TransferStoreFormDZ'), // 调拨登记单
-  'SparePickFormDZ': () => import('@/views/dz/SparePickFormDZ'), // 领用登记单
-  'SpareBackFormDZ': () => import('@/views/dz/SpareBackFormDZ'), // 退库登记单
-
   // 报表
   'AnalysisSbInfo': () => import('@/views/dashboard/AnalysisSbInfo'), // 保养任务完成率报表
   'CheckJobReport': () => import('@/views/dashboard/CheckJobReport'), // 保养任务完成率报表
@@ -390,19 +346,6 @@ export const constantRouterMap = [
       }
     ]
   },
-  {
-    path: '/demo',
-    component: BlankLayout,
-    redirect: '/demo/test',
-    hidden: true,
-    children: [
-      {
-        path: 'test',
-        name: 'test',
-        component: () => import(/* webpackChunkName: "user" */ '@/views/test/BaseFormBak')
-      }
-    ]
-  },
   {
     path: '/screen',
     component: BlankLayout,

+ 2 - 2
src/utils/dict.js

@@ -549,8 +549,8 @@ DictCache.VALUE = {
     TZSB: 5// 特种设备及附件
   },
   SB_IS_CHILD: {
-    IS_CHILD: '1', // 子
-    IS_PARENT: '2', // 父
+    IS_CHILD: '1', // 子设备
+    IS_PARENT: '2', // 父设备
     IS_NORMAL: '3' // 普通设备
   },
   SB_IS_SHOW: {

+ 2 - 2
src/views/Login.vue

@@ -2,8 +2,8 @@
   <div>
     <div class="fh-login">
       <div class="fh-login-left">
-        <h2 style='padding-bottom: 0px'>北京</h2>
-        <h2 style='padding-bottom: 0px'>乾元坤和</h2>
+        <h2 style='padding-bottom: 0px'>CNTHB</h2>
+        <h2 style='padding-bottom: 0px'>HITACHI ABB</h2>
         <h2 style='font-size:30px'>设备管理系统</h2>
       </div>
       <div class="fh-login-right">

+ 95 - 80
src/views/check/checkjob/CheckJob.vue

@@ -1,7 +1,7 @@
 <template>
-  <a-card :bordered="false">
-    <div v-show="visible">
-      <div class="table-page-search-wrapper">
+  <div>
+    <a-card style="margin-bottom: 8px;padding-bottom: 0px;">
+      <div class="table-page-search-wrapper" style="padding-bottom: 0px !important;">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="6" :sm="24">
@@ -40,6 +40,8 @@
                 </a-tree-select>
               </a-form-item>
             </a-col>
+          </a-row>
+          <a-row :gutter="48" v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="维护等级">
                 <a-select v-model="queryParam.standardLevel" placeholder="请选择">
@@ -101,93 +103,105 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :md="24" :sm="24">
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+
+    <a-card :bordered="false">
+      <div v-show="visible">
+        <div class="table-operator" style="margin-bottom: 16px;">
+          <a-row>
+            <a-col :md="16">
+              <a-button v-if="$auth('check-polling-jobs-add')" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
+              <a-button style="margin-left: 8px" v-if="($auth('check-spot-jobs-export') || $auth('check-polling-jobs-export'))" icon="download" @click="doExport">导出</a-button>
+              <a-button style="margin-left:8px;" @click="doImportForUpdate">
+                <a-icon type="upload"/>
+                修改导入
+              </a-button>
+              <a-button style="margin-left: 8px" @click="handleSeven">本周</a-button>
+              <a-button style="margin-left: 8px" @click="handleMonth">本月</a-button>
+              <a-button style="margin-left: 8px" @click="handleTuiCalendar">日历图</a-button>
+              <a-button style="margin-left: 8px" type="primary" @click="handleExecuteBatch" v-if="selectedRowKeys.length > 0">
+                <a-icon style="margin-left: 8px" type="plus"/>
+                批量接收
+              </a-button>
+              <a-button style="margin-left: 8px" type="primary" v-if="selectedRowKeys.length > 0" @click="handleFinishBatch">
+                <a-icon type="plus"/>
+                批量完成
+              </a-button>
+              <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && ($auth('check-spot-jobs-edit') || $auth('check-polling-jobs-edit'))">
+                <a-menu slot="overlay">
+                  <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
+                    <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
+                  </a-popconfirm>
+                </a-menu>
+                <a-button style="margin-left: 8px">
+                  批量操作 <a-icon type="down" />
+                </a-button>
+              </a-dropdown>
+            </a-col>
+            <a-col style="text-align: right">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="handleOk">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+                <a @click="()=>{ this.advanced = !this.advanced}" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
               </span>
             </a-col>
           </a-row>
-        </a-form>
-      </div>
-
-      <div class="table-operator">
-        <a-button v-if="$auth('check-polling-jobs-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-        <a-button style="margin-left: 8px" v-if="($auth('check-spot-jobs-export') || $auth('check-polling-jobs-export'))" type="primary" icon="download" @click="doExport">导出</a-button>
-        <a-button style="margin-left:8px;" type="primary" @click="doImportForUpdate">
-          <a-icon type="upload"/>
-          修改导入
-        </a-button>
-        <a-button style="margin-left: 8px" type="success" @click="handleSeven">本周</a-button>
-        <a-button style="margin-left: 8px" type="success" @click="handleMonth">本月</a-button>
-        <a-button style="margin-left: 8px" type="success" @click="handleTuiCalendar">日历图</a-button>
-        <a-button style="margin-left: 8px" type="primary" @click="handleExecuteBatch" v-if="selectedRowKeys.length > 0">
-          <a-icon style="margin-left: 8px" type="plus"/>
-          批量接收
-        </a-button>
-        <a-button style="margin-left: 8px" type="primary" v-if="selectedRowKeys.length > 0" @click="handleFinishBatch">
-          <a-icon type="plus"/>
-          批量完成
-        </a-button>
-        <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && ($auth('check-spot-jobs-edit') || $auth('check-polling-jobs-edit'))">
-          <a-menu slot="overlay">
-            <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
-              <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-            </a-popconfirm>
-          </a-menu>
-          <a-button style="margin-left: 8px">
-            批量操作 <a-icon type="down" />
-          </a-button>
-        </a-dropdown>
-      </div>
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
-        :data="loadData"
-        :alert="options.alert"
-        :rowSelection="options.rowSelection"
-        showPagination="auto"
-      >
-        <span slot="action" slot-scope="record">
-          <template>
-            <a @click="handleView(record)">查看</a>
-            <template v-if="record.status == DictCache.VALUE.CHECK_JOB_STATUS.NOT_EXECUTE">
-              <a-divider type="vertical" />
-              <a @click="handleExecute(record)">接收</a>
-            </template>
-            <template v-if="record.status === DictCache.VALUE.CHECK_JOB_STATUS.EXECUTING">
-              <a-divider type="vertical" />
-              <a @click="handleFinish(record)">完成</a>
-            </template>
-            <template v-if="record.status == DictCache.VALUE.CHECK_JOB_STATUS.NOT_EXECUTE || record.status === DictCache.VALUE.CHECK_JOB_STATUS.EXECUTING">
-              <a-divider type="vertical" />
-              <a @click="handleEdit(record)">修改</a>
-            </template>
+        </div>
+        <s-table
+          ref="table"
+          size="default"
+          rowKey="id"
+          :columns="columns"
+          :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
+          :data="loadData"
+          :alert="options.alert"
+          :rowSelection="options.rowSelection"
+          showPagination="auto"
+        >
+          <span slot="action" slot-scope="record">
+            <template>
+              <a @click="handleView(record)">查看</a>
+              <template v-if="record.status == DictCache.VALUE.CHECK_JOB_STATUS.NOT_EXECUTE">
+                <a-divider type="vertical" />
+                <a @click="handleExecute(record)">接收</a>
+              </template>
+              <template v-if="record.status === DictCache.VALUE.CHECK_JOB_STATUS.EXECUTING">
+                <a-divider type="vertical" />
+                <a @click="handleFinish(record)">完成</a>
+              </template>
+              <template v-if="record.status == DictCache.VALUE.CHECK_JOB_STATUS.NOT_EXECUTE || record.status === DictCache.VALUE.CHECK_JOB_STATUS.EXECUTING">
+                <a-divider type="vertical" />
+                <a @click="handleEdit(record)">修改</a>
+              </template>
             <!--          <a-divider type="vertical" />-->
             <!--          <a-popconfirm v-if="$auth('check-jobs-del')" title="是否要删除该条数据?" @confirm="batchDelete(record.id)">-->
             <!--            <a>删除</a>-->
             <!--          </a-popconfirm>-->
-          </template>
-        </span>
-        <span slot="status" slot-scope="text">
-          <badge
-            :status="DictCache.COLOR.JOB_STATUS[text]"
-            :text="statusMap[text]" />
-        </span>
-        <span slot="stopFlag" slot-scope="text">
-          <badge
-            :status="DictCache.COLOR.YES_NO[text]"
-            :text="sbStatusMap[text]" />
-        </span>
-      </s-table>
-    </div>
-    <base-form :check-type="checkType" ref="baseModal" @ok="handleOk"/>
-    <detail :check-type="checkType" ref="detailModal" @ok="handleOk"/>
-    <import-form-update ref="importModalUpdate" @ok="handleOk"/>
-  </a-card>
+            </template>
+          </span>
+          <span slot="status" slot-scope="text">
+            <badge
+              :status="DictCache.COLOR.JOB_STATUS[text]"
+              :text="statusMap[text]" />
+          </span>
+          <span slot="stopFlag" slot-scope="text">
+            <badge
+              :status="DictCache.COLOR.YES_NO[text]"
+              :text="sbStatusMap[text]" />
+          </span>
+        </s-table>
+      </div>
+      <base-form :check-type="checkType" ref="baseModal" @ok="handleOk"/>
+      <detail :check-type="checkType" ref="detailModal" @ok="handleOk"/>
+      <import-form-update ref="importModalUpdate" @ok="handleOk"/>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -239,6 +253,7 @@ export default {
     this.names = ['负责', '巡检']
     return {
       visible: true,
+      advanced: false,
       // 查询参数
       queryParam: {
         type: this.checkType,

+ 0 - 16
src/views/dz/InStoreFormDZ.vue

@@ -1,16 +0,0 @@
-<template>
-  <InStoreForm :filter="-1"/>
-</template>
-
-<script>
-import InStoreForm from '@/views/store/instoreform/InStoreForm'
-export default {
-  name: 'InStoreFormDZ',
-  components: {
-    InStoreForm
-  }
-}
-</script>
-
-<style scoped>
-</style>

+ 0 - 17
src/views/dz/OutStoreFormDZ.vue

@@ -1,17 +0,0 @@
-<template>
-  <OutStoreForm :filter="-1"/>
-</template>
-
-<script>
-import OutStoreForm from '@/views/store/outstoreform/OutStoreForm'
-export default {
-  name: 'OutStoreFormDZ',
-  components: {
-    OutStoreForm
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 17
src/views/dz/SpareBackFormDZ.vue

@@ -1,17 +0,0 @@
-<template>
-  <SpareBackForm :filter="-1"/>
-</template>
-
-<script>
-import SpareBackForm from '@/views/store/sparebackform/SpareBackForm'
-export default {
-  name: 'SpareBackFormDZ',
-  components: {
-    SpareBackForm
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 17
src/views/dz/SparePickFormDZ.vue

@@ -1,17 +0,0 @@
-<template>
-  <SparePickForm :filter="-1"/>
-</template>
-
-<script>
-import SparePickForm from '@/views/store/sparepickform/SparePickForm'
-export default {
-  name: 'SparePickFormDZ',
-  components: {
-    SparePickForm
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 17
src/views/dz/TransferStoreFormDZ.vue

@@ -1,17 +0,0 @@
-<template>
-  <TransferStoreForm :filter="-1"/>
-</template>
-
-<script>
-import TransferStoreForm from '@/views/store/transferstoreform/TransferStoreForm'
-export default {
-  name: 'TransferStoreFormDZ',
-  components: {
-    TransferStoreForm
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 138
src/views/form/BasicForm.vue

@@ -1,138 +0,0 @@
-<template>
-  <a-card :body-style="{padding: '24px 32px'}" :bordered="false">
-    <a-form @submit="handleSubmit" :form="form">
-      <a-form-item
-        label="标题"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-input
-          v-decorator="[
-            'name',
-            {rules: [{ required: true, message: '请输入标题' }]}
-          ]"
-          name="name"
-          placeholder="给目标起个名字" />
-      </a-form-item>
-      <a-form-item
-        label="起止日期"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-range-picker
-          name="buildTime"
-          style="width: 100%"
-          v-decorator="[
-            'buildTime',
-            {rules: [{ required: true, message: '请选择起止日期' }]}
-          ]" />
-      </a-form-item>
-      <a-form-item
-        label="目标描述"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-textarea
-          rows="4"
-          placeholder="请输入你阶段性工作目标"
-          v-decorator="[
-            'description',
-            {rules: [{ required: true, message: '请输入目标描述' }]}
-          ]" />
-      </a-form-item>
-      <a-form-item
-        label="衡量标准"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-textarea
-          rows="4"
-          placeholder="请输入衡量标准"
-          v-decorator="[
-            'type',
-            {rules: [{ required: true, message: '请输入衡量标准' }]}
-          ]" />
-      </a-form-item>
-      <a-form-item
-        label="客户"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
-        <a-input
-          placeholder="请描述你服务的客户,内部客户直接 @姓名/工号"
-          v-decorator="[
-            'customer',
-            {rules: [{ required: true, message: '请描述你服务的客户' }]}
-          ]" />
-      </a-form-item>
-      <a-form-item
-        label="邀评人"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
-        :required="false"
-      >
-        <a-input placeholder="请直接 @姓名/工号,最多可邀请 5 人" />
-      </a-form-item>
-      <a-form-item
-        label="权重"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
-        :required="false"
-      >
-        <a-input-number :min="0" :max="100" />
-        <span> %</span>
-      </a-form-item>
-      <a-form-item
-        label="目标公开"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
-        :required="false"
-        help="客户、邀评人默认被分享"
-      >
-        <a-radio-group v-model="value">
-          <a-radio :value="1">公开</a-radio>
-          <a-radio :value="2">部分公开</a-radio>
-          <a-radio :value="3">不公开</a-radio>
-        </a-radio-group>
-        <a-form-item>
-          <a-select mode="multiple" v-if="value === 2">
-            <a-select-option value="4">同事一</a-select-option>
-            <a-select-option value="5">同事二</a-select-option>
-            <a-select-option value="6">同事三</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-form-item>
-      <a-form-item
-        :wrapperCol="{ span: 24 }"
-        style="text-align: center"
-      >
-        <a-button htmlType="submit" type="primary">提交</a-button>
-        <a-button style="margin-left: 8px">保存</a-button>
-      </a-form-item>
-    </a-form>
-  </a-card>
-</template>
-
-<script>
-export default {
-  name: 'BaseForm',
-  data () {
-    return {
-      description: '表单页用于向用户收集或验证信息,基础表单常见于数据项较少的表单场景。',
-      value: 1,
-
-      // form
-      form: this.$form.createForm(this)
-
-    }
-  },
-  methods: {
-
-    // handler
-    handleSubmit (e) {
-      e.preventDefault()
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          // eslint-disable-next-line no-console
-          console.log('Received values of form: ', values)
-        }
-      })
-    }
-  }
-}
-</script>

+ 0 - 331
src/views/form/advancedForm/AdvancedForm.vue

@@ -1,331 +0,0 @@
-<template>
-  <div>
-    <a-card class="card" title="仓库管理" :bordered="false">
-      <repository-form ref="repository" :showSubmit="false" />
-    </a-card>
-    <a-card class="card" title="任务管理" :bordered="false">
-      <task-form ref="task" :showSubmit="false" />
-    </a-card>
-
-    <!-- table -->
-    <a-card>
-      <a-table
-        :columns="columns"
-        :dataSource="data"
-        :pagination="false"
-        :loading="memberLoading"
-      >
-        <template v-for="(col, i) in ['name', 'workId', 'department']" :slot="col" slot-scope="text, record">
-          <a-input
-            :key="col"
-            v-if="record.editable"
-            style="margin: -5px 0"
-            :value="text"
-            :placeholder="columns[i].title"
-            @change="e => handleChange(e.target.value, record.key, col)"
-          />
-          <template v-else>{{ text }}</template>
-        </template>
-        <template slot="operation" slot-scope="text, record">
-          <template v-if="record.editable">
-            <span v-if="record.isNew">
-              <a @click="saveRow(record)">添加</a>
-              <a-divider type="vertical" />
-              <a-popconfirm title="是否要删除此行?" @confirm="remove(record.key)">
-                <a>删除</a>
-              </a-popconfirm>
-            </span>
-            <span v-else>
-              <a @click="saveRow(record)">保存</a>
-              <a-divider type="vertical" />
-              <a @click="cancel(record.key)">取消</a>
-            </span>
-          </template>
-          <span v-else>
-            <a @click="toggle(record.key)">编辑</a>
-            <a-divider type="vertical" />
-            <a-popconfirm title="是否要删除此行?" @confirm="remove(record.key)">
-              <a>删除</a>
-            </a-popconfirm>
-          </span>
-        </template>
-      </a-table>
-      <a-button style="width: 100%; margin-top: 16px; margin-bottom: 8px" type="dashed" icon="plus" @click="newMember">新增成员</a-button>
-    </a-card>
-
-    <!-- fixed footer toolbar -->
-    <footer-tool-bar :style="{ width: isSideMenu() && isDesktop() ? `calc(100% - ${sidebarOpened ? 256 : 80}px)` : '100%'}">
-      <span class="popover-wrapper">
-        <a-popover title="表单校验信息" overlayClassName="antd-pro-pages-forms-style-errorPopover" trigger="click" :getPopupContainer="trigger => trigger.parentNode">
-          <template slot="content">
-            <li v-for="item in errors" :key="item.key" @click="scrollToField(item.key)" class="antd-pro-pages-forms-style-errorListItem">
-              <a-icon type="cross-circle-o" class="antd-pro-pages-forms-style-errorIcon" />
-              <div class="">{{ item.message }}</div>
-              <div class="antd-pro-pages-forms-style-errorField">{{ item.fieldLabel }}</div>
-            </li>
-          </template>
-          <span class="antd-pro-pages-forms-style-errorIcon" v-if="errors.length > 0">
-            <a-icon type="exclamation-circle" />{{ errors.length }}
-          </span>
-        </a-popover>
-      </span>
-      <a-button type="primary" @click="validate" :loading="loading">提交</a-button>
-    </footer-tool-bar>
-  </div>
-</template>
-
-<script>
-import RepositoryForm from './RepositoryForm'
-import TaskForm from './TaskForm'
-import FooterToolBar from '@/components/FooterToolbar'
-import { mixin, mixinDevice } from '@/utils/mixin'
-
-const fieldLabels = {
-  name: '仓库名',
-  url: '仓库域名',
-  owner: '仓库管理员',
-  approver: '审批人',
-  dateRange: '生效日期',
-  type: '仓库类型',
-  name2: '任务名',
-  url2: '任务描述',
-  owner2: '执行人',
-  approver2: '责任人',
-  dateRange2: '生效日期',
-  type2: '任务类型'
-}
-
-export default {
-  name: 'AdvancedForm',
-  mixins: [mixin, mixinDevice],
-  components: {
-    FooterToolBar,
-    RepositoryForm,
-    TaskForm
-  },
-  data () {
-    return {
-      description: '高级表单常见于一次性输入和提交大批量数据的场景。',
-      loading: false,
-      memberLoading: false,
-
-      // table
-      columns: [
-        {
-          title: '成员姓名',
-          dataIndex: 'name',
-          key: 'name',
-          width: '20%',
-          scopedSlots: { customRender: 'name' }
-        },
-        {
-          title: '工号',
-          dataIndex: 'workId',
-          key: 'workId',
-          width: '20%',
-          scopedSlots: { customRender: 'workId' }
-        },
-        {
-          title: '所属部门',
-          dataIndex: 'department',
-          key: 'department',
-          width: '40%',
-          scopedSlots: { customRender: 'department' }
-        },
-        {
-          title: '操作',
-          key: 'action',
-          scopedSlots: { customRender: 'operation' }
-        }
-      ],
-      data: [
-        {
-          key: '1',
-          name: '小明',
-          workId: '001',
-          editable: false,
-          department: '行政部'
-        },
-        {
-          key: '2',
-          name: '李莉',
-          workId: '002',
-          editable: false,
-          department: 'IT部'
-        },
-        {
-          key: '3',
-          name: '王小帅',
-          workId: '003',
-          editable: false,
-          department: '财务部'
-        }
-      ],
-
-      errors: []
-    }
-  },
-  methods: {
-    handleSubmit (e) {
-      e.preventDefault()
-    },
-    newMember () {
-      const length = this.data.length
-      this.data.push({
-        key: length === 0 ? '1' : (parseInt(this.data[length - 1].key) + 1).toString(),
-        name: '',
-        workId: '',
-        department: '',
-        editable: true,
-        isNew: true
-      })
-    },
-    remove (key) {
-      const newData = this.data.filter(item => item.key !== key)
-      this.data = newData
-    },
-    saveRow (record) {
-      this.memberLoading = true
-      const { key, name, workId, department } = record
-      if (!name || !workId || !department) {
-        this.memberLoading = false
-        this.$message.error('请填写完整成员信息。')
-        return
-      }
-      // 模拟网络请求、卡顿 800ms
-      new Promise((resolve) => {
-        setTimeout(() => {
-          resolve({ loop: false })
-        }, 800)
-      }).then(() => {
-        const target = this.data.find(item => item.key === key)
-        target.editable = false
-        target.isNew = false
-        this.memberLoading = false
-      })
-    },
-    toggle (key) {
-      const target = this.data.find(item => item.key === key)
-      target._originalData = { ...target }
-      target.editable = !target.editable
-    },
-    getRowByKey (key, newData) {
-      const data = this.data
-      return (newData || data).find(item => item.key === key)
-    },
-    cancel (key) {
-      const target = this.data.find(item => item.key === key)
-      Object.keys(target).forEach(key => { target[key] = target._originalData[key] })
-      target._originalData = undefined
-    },
-    handleChange (value, key, column) {
-      const newData = [...this.data]
-      const target = newData.find(item => key === item.key)
-      if (target) {
-        target[column] = value
-        this.data = newData
-      }
-    },
-
-    // 最终全页面提交
-    validate () {
-      const { $refs: { repository, task }, $notification } = this
-      const repositoryForm = new Promise((resolve, reject) => {
-        repository.form.validateFields((err, values) => {
-          if (err) {
-            reject(err)
-            return
-          }
-          resolve(values)
-        })
-      })
-      const taskForm = new Promise((resolve, reject) => {
-        task.form.validateFields((err, values) => {
-          if (err) {
-            reject(err)
-            return
-          }
-          resolve(values)
-        })
-      })
-
-      // clean this.errors
-      this.errors = []
-      Promise.all([repositoryForm, taskForm]).then(values => {
-        $notification['error']({
-          message: 'Received values of form:',
-          description: JSON.stringify(values)
-        })
-      }).catch(() => {
-        const errors = Object.assign({}, repository.form.getFieldsError(), task.form.getFieldsError())
-        const tmp = { ...errors }
-        this.errorList(tmp)
-      })
-    },
-    errorList (errors) {
-      if (!errors || errors.length === 0) {
-        return
-      }
-      this.errors = Object.keys(errors)
-        .filter(key => errors[key])
-        .map(key => ({
-          key: key,
-          message: errors[key][0],
-          fieldLabel: fieldLabels[key]
-        }))
-    },
-    scrollToField (fieldKey) {
-      const labelNode = document.querySelector(`label[for="${fieldKey}"]`)
-      if (labelNode) {
-        labelNode.scrollIntoView(true)
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .card{
-    margin-bottom: 24px;
-  }
-  .popover-wrapper {
-    /deep/ .antd-pro-pages-forms-style-errorPopover .ant-popover-inner-content {
-      min-width: 256px;
-      max-height: 290px;
-      padding: 0;
-      overflow: auto;
-    }
-  }
-  .antd-pro-pages-forms-style-errorIcon {
-    user-select: none;
-    margin-right: 24px;
-    color: #f5222d;
-    cursor: pointer;
-    i {
-          margin-right: 4px;
-    }
-  }
-  .antd-pro-pages-forms-style-errorListItem {
-    padding: 8px 16px;
-    list-style: none;
-    border-bottom: 1px solid #e8e8e8;
-    cursor: pointer;
-    transition: all .3s;
-
-    &:hover {
-      background: #e6f7ff;
-    }
-    .antd-pro-pages-forms-style-errorIcon {
-      float: left;
-      margin-top: 4px;
-      margin-right: 12px;
-      padding-bottom: 22px;
-      color: #f5222d;
-    }
-    .antd-pro-pages-forms-style-errorField {
-      margin-top: 2px;
-      color: rgba(0,0,0,.45);
-      font-size: 12px;
-    }
-  }
-</style>

+ 0 - 119
src/views/form/advancedForm/RepositoryForm.vue

@@ -1,119 +0,0 @@
-<template>
-  <a-form @submit="handleSubmit" :form="form" class="form">
-    <a-row class="form-row" :gutter="16">
-      <a-col :lg="6" :md="12" :sm="24">
-        <a-form-item label="仓库名">
-          <a-input
-            placeholder="请输入仓库名称"
-            v-decorator="[
-              'name',
-              {rules: [{ required: true, message: '请输入仓库名称', whitespace: true}]}
-            ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-        <a-form-item
-          label="仓库域名">
-          <a-input
-            addonBefore="http://"
-            addonAfter=".com"
-            placeholder="请输入"
-            v-decorator="[
-              'url',
-              {rules: [{ required: true, message: '请输入仓库域名', whitespace: true}, {validator: validate}]}
-            ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 9, offset: 1}" :lg="{span: 10}" :md="{span: 24}" :sm="24">
-        <a-form-item
-          label="仓库管理员">
-          <a-select placeholder="请选择管理员" v-decorator="[ 'owner', {initialValue:1,rules: [{ required: true, message: '请选择管理员'}]} ]">
-            <a-select-option :value="1">王同学</a-select-option>
-            <a-select-option :value="2">李同学</a-select-option>
-            <a-select-option :value="3">黄同学</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-    </a-row>
-    <a-row class="form-row" :gutter="16">
-      <a-col :lg="6" :md="12" :sm="24">
-        <a-form-item
-          label="审批人">
-          <a-select placeholder="请选择审批员" v-decorator="[ 'approver', {rules: [{ required: true, message: '请选择审批员'}]} ]">
-            <a-select-option value="王晓丽">王晓丽</a-select-option>
-            <a-select-option value="李军">李军</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-        <a-form-item
-          label="生效日期">
-          <a-range-picker
-            style="width: 100%"
-            v-decorator="[
-              'dateRange',
-              {rules: [{ required: true, message: '请选择生效日期'}]}
-            ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 9, offset: 1}" :lg="{span: 10}" :md="{span: 24}" :sm="24">
-        <a-form-item
-          label="仓库类型">
-          <a-select
-            placeholder="请选择仓库类型"
-            v-decorator="[
-              'type',
-              {rules: [{ required: true, message: '请选择仓库类型'}]}
-            ]" >
-            <a-select-option value="公开">公开</a-select-option>
-            <a-select-option value="私密">私密</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-    </a-row>
-    <a-form-item v-if="showSubmit">
-      <a-button htmlType="submit" >Submit</a-button>
-    </a-form-item>
-  </a-form>
-</template>
-
-<script>
-export default {
-  name: 'RepositoryForm',
-  props: {
-    showSubmit: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      form: this.$form.createForm(this)
-    }
-  },
-  methods: {
-    handleSubmit (e) {
-      e.preventDefault()
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          this.$notification['error']({
-            message: 'Received values of form:',
-            description: values
-          })
-        }
-      })
-    },
-    validate (rule, value, callback) {
-      const regex = /^user-(.*)$/
-      if (!regex.test(value)) {
-        callback(new Error('需要以 user- 开头'))
-      }
-      callback()
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 107
src/views/form/advancedForm/TaskForm.vue

@@ -1,107 +0,0 @@
-<template>
-  <a-form @submit="handleSubmit" :form="form" class="form">
-    <a-row class="form-row" :gutter="16">
-      <a-col :lg="6" :md="12" :sm="24">
-        <a-form-item
-          label="任务名">
-          <a-input placeholder="请输入任务名称" v-decorator="[ 'name2', {rules: [{ required: true, message: '请输入任务名称', whitespace: true}]} ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-        <a-form-item
-          label="任务描述">
-          <a-input placeholder="请输入任务描述" v-decorator="[ 'url2', {rules: [{ required: true, message: '请输入任务描述', whitespace: true}]} ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 9, offset: 1}" :lg="{span: 10}" :md="{span: 24}" :sm="24">
-        <a-form-item
-          label="执行人">
-          <a-select
-            placeholder="请选择执行人"
-            v-decorator="[
-              'owner2',
-              {rules: [{ required: true, message: '请选择执行人'}]}
-            ]" >
-            <a-select-option value="黄丽丽">黄丽丽</a-select-option>
-            <a-select-option value="李大刀">李大刀</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-    </a-row>
-    <a-row class="form-row" :gutter="16">
-      <a-col :lg="6" :md="12" :sm="24">
-        <a-form-item
-          label="责任人">
-          <a-select
-            placeholder="请选择责任人"
-            v-decorator="[
-              'approver2',
-              {rules: [{ required: true, message: '请选择责任人'}]}
-            ]" >
-            <a-select-option value="王伟">王伟</a-select-option>
-            <a-select-option value="李红军">李红军</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-        <a-form-item
-          label="提醒时间">
-          <a-time-picker
-            style="width: 100%"
-            v-decorator="[
-              'dateRange2',
-              {rules: [{ required: true, message: '请选择提醒时间'}]}
-            ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 9, offset: 1}" :lg="{span: 10}" :md="{span: 24}" :sm="24">
-        <a-form-item
-          label="任务类型">
-          <a-select
-            placeholder="请选择任务类型"
-            v-decorator="[ 'type2', {rules: [{ required: true, message: '请选择任务类型'}]} ]" >
-            <a-select-option value="定时执行">定时执行</a-select-option>
-            <a-select-option value="周期执行">周期执行</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-    </a-row>
-    <a-form-item v-if="showSubmit">
-      <a-button htmlType="submit" >Submit</a-button>
-    </a-form-item>
-  </a-form>
-</template>
-
-<script>
-export default {
-  name: 'TaskForm',
-  props: {
-    showSubmit: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      form: this.$form.createForm(this)
-    }
-  },
-  methods: {
-    handleSubmit (e) {
-      e.preventDefault()
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          this.$notification['error']({
-            message: 'Received values of form:',
-            description: values
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 112
src/views/form/stepForm/Step1.vue

@@ -1,112 +0,0 @@
-<template>
-  <div>
-    <a-form :form="form" style="max-width: 500px; margin: 40px auto 0;">
-      <a-form-item
-        label="付款账户"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-      >
-        <a-select
-          placeholder="ant-design@alipay.com"
-          v-decorator="['paymentUser', { rules: [{required: true, message: '付款账户必须填写'}] }]">
-          <a-select-option value="1">ant-design@alipay.com</a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item
-        label="收款账户"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-      >
-        <a-input-group
-          style="display: inline-block; vertical-align: middle"
-          :compact="true"
-        >
-          <a-select defaultValue="alipay" style="width: 100px">
-            <a-select-option value="alipay">支付宝</a-select-option>
-            <a-select-option value="wexinpay">微信</a-select-option>
-          </a-select>
-          <a-input
-            :style="{width: 'calc(100% - 100px)'}"
-            v-decorator="['payType', { initialValue: 'test@example.com', rules: [{required: true, message: '收款账户必须填写'}]}]"
-          />
-        </a-input-group>
-      </a-form-item>
-      <a-form-item
-        label="收款人姓名"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-      >
-        <a-input v-decorator="['name', { initialValue: 'Alex', rules: [{required: true, message: '收款人名称必须核对'}] }]"/>
-      </a-form-item>
-      <a-form-item
-        label="转账金额"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-      >
-        <a-input prefix="¥" v-decorator="['momey', { initialValue: '5000', rules: [{required: true, message: '转账金额必须填写'}] }]"/>
-      </a-form-item>
-      <a-form-item :wrapperCol="{span: 19, offset: 5}">
-        <a-button type="primary" @click="nextStep">下一步</a-button>
-      </a-form-item>
-    </a-form>
-    <a-divider />
-    <div class="step-form-style-desc">
-      <h3>说明</h3>
-      <h4>转账到支付宝账户</h4>
-      <p>如果需要,这里可以放一些关于产品的常见问题说明。如果需要,这里可以放一些关于产品的常见问题说明。如果需要,这里可以放一些关于产品的常见问题说明。</p>
-      <h4>转账到银行卡</h4>
-      <p>如果需要,这里可以放一些关于产品的常见问题说明。如果需要,这里可以放一些关于产品的常见问题说明。如果需要,这里可以放一些关于产品的常见问题说明。</p>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Step1',
-  data () {
-    return {
-      labelCol: { lg: { span: 5 }, sm: { span: 5 } },
-      wrapperCol: { lg: { span: 19 }, sm: { span: 19 } },
-      form: this.$form.createForm(this)
-    }
-  },
-  methods: {
-    nextStep () {
-      const { form: { validateFields } } = this
-      // 先校验,通过表单校验后,才进入下一步
-      validateFields((err, values) => {
-        if (!err) {
-          this.$emit('nextStep')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.step-form-style-desc {
-  padding: 0 56px;
-  color: rgba(0,0,0,.45);
-
-  h3 {
-    margin: 0 0 12px;
-    color: rgba(0,0,0,.45);
-    font-size: 16px;
-    line-height: 32px;
-  }
-
-  h4 {
-    margin: 0 0 4px;
-    color: rgba(0,0,0,.45);
-    font-size: 14px;
-    line-height: 22px;
-  }
-
-  p {
-    margin-top: 0;
-    margin-bottom: 12px;
-    line-height: 22px;
-  }
-}
-</style>

+ 0 - 110
src/views/form/stepForm/Step2.vue

@@ -1,110 +0,0 @@
-<template>
-  <div>
-    <a-form :form="form" style="max-width: 500px; margin: 40px auto 0;">
-      <a-alert
-        :closable="true"
-        message="确认转账后,资金将直接打入对方账户,无法退回。"
-        style="margin-bottom: 24px;"
-      />
-      <a-form-item
-        label="付款账户"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        class="stepFormText"
-      >
-        ant-design@alipay.com
-      </a-form-item>
-      <a-form-item
-        label="收款账户"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        class="stepFormText"
-      >
-        test@example.com
-      </a-form-item>
-      <a-form-item
-        label="收款人姓名"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        class="stepFormText"
-      >
-        Alex
-      </a-form-item>
-      <a-form-item
-        label="转账金额"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        class="stepFormText"
-      >
-        ¥ 5,000.00
-      </a-form-item>
-      <a-divider />
-      <a-form-item
-        label="支付密码"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        class="stepFormText"
-      >
-        <a-input
-          type="password"
-          style="width: 80%;"
-          v-decorator="['paymentPassword', { initialValue: '123456', rules: [{required: true, message: '请输入支付密码'}] }]" />
-      </a-form-item>
-      <a-form-item :wrapperCol="{span: 19, offset: 5}">
-        <a-button :loading="loading" type="primary" @click="nextStep">提交</a-button>
-        <a-button style="margin-left: 8px" @click="prevStep">上一步</a-button>
-      </a-form-item>
-    </a-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Step2',
-  data () {
-    return {
-      labelCol: { lg: { span: 5 }, sm: { span: 5 } },
-      wrapperCol: { lg: { span: 19 }, sm: { span: 19 } },
-      form: this.$form.createForm(this),
-      loading: false,
-      timer: 0
-    }
-  },
-  methods: {
-    nextStep () {
-      const that = this
-      const { form: { validateFields } } = this
-      that.loading = true
-      validateFields((err, values) => {
-        if (!err) {
-          console.log('表单 values', values)
-          that.timer = setTimeout(function () {
-            that.loading = false
-            that.$emit('nextStep')
-          }, 1500)
-        } else {
-          that.loading = false
-        }
-      })
-    },
-    prevStep () {
-      this.$emit('prevStep')
-    }
-  },
-  beforeDestroy () {
-    clearTimeout(this.timer)
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .stepFormText {
-    margin-bottom: 24px;
-
-    .ant-form-item-label,
-    .ant-form-item-control {
-      line-height: 22px;
-    }
-  }
-
-</style>

+ 0 - 69
src/views/form/stepForm/Step3.vue

@@ -1,69 +0,0 @@
-<template>
-  <div>
-    <a-form style="margin: 40px auto 0;">
-      <result title="操作成功" :is-success="true" description="预计两小时内到账" style="max-width: 560px;">
-        <div class="information">
-          <a-row>
-            <a-col :sm="8" :xs="24">付款账户:</a-col>
-            <a-col :sm="16" :xs="24">ant-design@alipay.com</a-col>
-          </a-row>
-          <a-row>
-            <a-col :sm="8" :xs="24">收款账户:</a-col>
-            <a-col :sm="16" :xs="24">test@example.com</a-col>
-          </a-row>
-          <a-row>
-            <a-col :sm="8" :xs="24">收款人姓名:</a-col>
-            <a-col :sm="16" :xs="24">辉夜</a-col>
-          </a-row>
-          <a-row>
-            <a-col :sm="8" :xs="24">转账金额:</a-col>
-            <a-col :sm="16" :xs="24"><span class="money">500</span> 元</a-col>
-          </a-row>
-        </div>
-        <div slot="action">
-          <a-button type="primary" @click="finish">再转一笔</a-button>
-          <a-button style="margin-left: 8px" @click="toOrderList">查看账单</a-button>
-        </div>
-      </result>
-    </a-form>
-  </div>
-</template>
-
-<script>
-import { Result } from '@/components'
-
-export default {
-  name: 'Step3',
-  components: {
-    Result
-  },
-  data () {
-    return {
-      loading: false
-    }
-  },
-  methods: {
-    finish () {
-      this.$emit('finish')
-    },
-    toOrderList () {
-      this.$router.push('/list/table-list')
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-  .information {
-    line-height: 22px;
-
-    .ant-row:not(:last-child) {
-      margin-bottom: 24px;
-    }
-  }
-  .money {
-    font-family: "Helvetica Neue",sans-serif;
-    font-weight: 500;
-    font-size: 20px;
-    line-height: 14px;
-  }
-</style>

+ 0 - 62
src/views/form/stepForm/StepForm.vue

@@ -1,62 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <a-steps class="steps" :current="currentTab">
-      <a-step title="填写转账信息" />
-      <a-step title="确认转账信息" />
-      <a-step title="完成" />
-    </a-steps>
-    <div class="content">
-      <step1 v-if="currentTab === 0" @nextStep="nextStep"/>
-      <step2 v-if="currentTab === 1" @nextStep="nextStep" @prevStep="prevStep"/>
-      <step3 v-if="currentTab === 2" @prevStep="prevStep" @finish="finish"/>
-    </div>
-  </a-card>
-</template>
-
-<script>
-import Step1 from './Step1'
-import Step2 from './Step2'
-import Step3 from './Step3'
-
-export default {
-  name: 'StepForm',
-  components: {
-    Step1,
-    Step2,
-    Step3
-  },
-  data () {
-    return {
-      description: '将一个冗长或用户不熟悉的表单任务分成多个步骤,指导用户完成。',
-      currentTab: 0,
-
-      // form
-      form: null
-    }
-  },
-  methods: {
-
-    // handler
-    nextStep () {
-      if (this.currentTab < 2) {
-        this.currentTab += 1
-      }
-    },
-    prevStep () {
-      if (this.currentTab > 0) {
-        this.currentTab -= 1
-      }
-    },
-    finish () {
-      this.currentTab = 0
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .steps {
-    max-width: 750px;
-    margin: 16px auto;
-  }
-</style>

+ 0 - 135
src/views/list/CardList.vue

@@ -1,135 +0,0 @@
-<template>
-  <div class="card-list" ref="content">
-    <a-list
-      rowKey="id"
-      :grid="{gutter: 24, lg: 3, md: 2, sm: 1, xs: 1}"
-      :dataSource="dataSource"
-    >
-      <a-list-item slot="renderItem" slot-scope="item">
-        <template v-if="!item || item.id === undefined">
-          <a-button class="new-btn" type="dashed">
-            <a-icon type="plus"/>
-            新增产品
-          </a-button>
-        </template>
-        <template v-else>
-          <a-card :hoverable="true">
-            <a-card-meta>
-              <a slot="title">{{ item.title }}</a>
-              <a-avatar class="card-avatar" slot="avatar" :src="item.avatar" size="large"/>
-              <div class="meta-content" slot="description">{{ item.content }}</div>
-            </a-card-meta>
-            <template class="ant-card-actions" slot="actions">
-              <a>操作一</a>
-              <a>操作二</a>
-            </template>
-          </a-card>
-        </template>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-
-const dataSource = []
-dataSource.push({})
-for (let i = 0; i < 11; i++) {
-  dataSource.push({
-    id: i,
-    title: 'Alipay',
-    avatar: 'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png',
-    content: '在中台产品的研发过程中,会出现不同的设计规范和实现方式,但其中往往存在很多类似的页面和组件,这些类似的组件会被抽离成一套标准规范。'
-  })
-}
-
-export default {
-  name: 'CardList',
-  data () {
-    return {
-      description: '段落示意:蚂蚁金服务设计平台 ant.design,用最小的工作量,无缝接入蚂蚁金服生态, 提供跨越设计与开发的体验解决方案。',
-      linkList: [
-        { icon: 'rocket', href: '#', title: '快速开始' },
-        { icon: 'info-circle-o', href: '#', title: '产品简介' },
-        { icon: 'file-text', href: '#', title: '产品文档' }
-      ],
-      extraImage: 'https://gw.alipayobjects.com/zos/rmsportal/RzwpdLnhmvDJToTdfDPe.png',
-      dataSource
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  @import "~@/components/index.less";
-
-  .card-list {
-    /deep/ .ant-card-body:hover {
-      .ant-card-meta-title>a {
-        color: @primary-color;
-      }
-    }
-
-    /deep/ .ant-card-meta-title {
-      margin-bottom: 12px;
-
-      &>a {
-        display: inline-block;
-        max-width: 100%;
-        color: rgba(0,0,0,.85);
-      }
-    }
-
-    /deep/ .meta-content {
-      position: relative;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      height: 64px;
-      -webkit-line-clamp: 3;
-      -webkit-box-orient: vertical;
-
-      margin-bottom: 1em;
-    }
-  }
-
-  .card-avatar {
-    width: 48px;
-    height: 48px;
-    border-radius: 48px;
-  }
-
-  .ant-card-actions {
-    background: #f7f9fa;
-
-    li {
-      float: left;
-      text-align: center;
-      margin: 12px 0;
-      color: rgba(0, 0, 0, 0.45);
-      width: 50%;
-
-      &:not(:last-child) {
-        border-right: 1px solid #e8e8e8;
-      }
-
-      a {
-        color: rgba(0, 0, 0, .45);
-        line-height: 22px;
-        display: inline-block;
-        width: 100%;
-        &:hover {
-          color: @primary-color;
-        }
-      }
-    }
-  }
-
-  .new-btn {
-    background-color: #fff;
-    border-radius: 2px;
-    width: 100%;
-    height: 188px;
-  }
-
-</style>

+ 0 - 50
src/views/list/QueryList.vue

@@ -1,50 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <component @onEdit="handleEdit" @onGoBack="handleGoBack" :record="record" :is="currentComponet"></component>
-  </a-card>
-</template>
-
-<script>
-
-import ATextarea from 'ant-design-vue/es/input/TextArea'
-import AInput from 'ant-design-vue/es/input/Input'
-// 动态切换组件
-import List from '@/views/list/table/List'
-import Edit from '@/views/list/table/Edit'
-
-export default {
-  name: 'TableListWrapper',
-  components: {
-    AInput,
-    ATextarea,
-    List,
-    Edit
-  },
-  data () {
-    return {
-      currentComponet: 'List',
-      record: ''
-    }
-  },
-  created () {
-
-  },
-  methods: {
-    handleEdit (record) {
-      this.record = record || ''
-      this.currentComponet = 'Edit'
-      console.log(record)
-    },
-    handleGoBack () {
-      this.record = ''
-      this.currentComponet = 'List'
-    }
-  },
-  watch: {
-    '$route.path' () {
-      this.record = ''
-      this.currentComponet = 'List'
-    }
-  }
-}
-</script>

+ 0 - 168
src/views/list/StandardList.vue

@@ -1,168 +0,0 @@
-<template>
-  <div>
-    <a-card :bordered="false">
-      <a-row>
-        <a-col :sm="8" :xs="24">
-          <head-info title="我的待办" content="8个任务" :bordered="true"/>
-        </a-col>
-        <a-col :sm="8" :xs="24">
-          <head-info title="本周任务平均处理时间" content="32分钟" :bordered="true"/>
-        </a-col>
-        <a-col :sm="8" :xs="24">
-          <head-info title="本周完成任务数" content="24个"/>
-        </a-col>
-      </a-row>
-    </a-card>
-
-    <a-card
-      style="margin-top: 24px"
-      :bordered="false"
-      title="标准列表">
-
-      <div slot="extra">
-        <a-radio-group v-model="status">
-          <a-radio-button value="all">全部</a-radio-button>
-          <a-radio-button value="processing">进行中</a-radio-button>
-          <a-radio-button value="waiting">等待中</a-radio-button>
-        </a-radio-group>
-        <a-input-search style="margin-left: 16px; width: 272px;" />
-      </div>
-
-      <div class="operate">
-        <a-button type="dashed" style="width: 100%" icon="plus" @click="$refs.taskForm.add()">添加</a-button>
-      </div>
-
-      <a-list size="large" :pagination="{showSizeChanger: true, showQuickJumper: true, pageSize: 5, total: 50}">
-        <a-list-item :key="index" v-for="(item, index) in data">
-          <a-list-item-meta :description="item.description">
-            <a-avatar slot="avatar" size="large" shape="square" :src="item.avatar"/>
-            <a slot="title">{{ item.title }}</a>
-          </a-list-item-meta>
-          <div slot="actions">
-            <a>编辑</a>
-          </div>
-          <div slot="actions">
-            <a-dropdown>
-              <a-menu slot="overlay">
-                <a-menu-item><a>编辑</a></a-menu-item>
-                <a-menu-item><a>删除</a></a-menu-item>
-              </a-menu>
-              <a>更多<a-icon type="down"/></a>
-            </a-dropdown>
-          </div>
-          <div class="list-content">
-            <div class="list-content-item">
-              <span>Owner</span>
-              <p>{{ item.owner }}</p>
-            </div>
-            <div class="list-content-item">
-              <span>开始时间</span>
-              <p>{{ item.startAt }}</p>
-            </div>
-            <div class="list-content-item">
-              <a-progress :percent="item.progress.value" :status="!item.progress.status ? null : item.progress.status" style="width: 180px" />
-            </div>
-          </div>
-        </a-list-item>
-      </a-list>
-
-      <task-form ref="taskForm" />
-    </a-card>
-  </div>
-</template>
-
-<script>
-import HeadInfo from '@/components/tools/HeadInfo'
-import TaskForm from './modules/TaskForm'
-
-const data = []
-data.push({
-  title: 'Alipay',
-  avatar: 'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png',
-  description: '那是一种内在的东西, 他们到达不了,也无法触及的',
-  owner: '付晓晓',
-  startAt: '2018-07-26 22:44',
-  progress: {
-    value: 90
-  }
-})
-data.push({
-  title: 'Angular',
-  avatar: 'https://gw.alipayobjects.com/zos/rmsportal/zOsKZmFRdUtvpqCImOVY.png',
-  description: '希望是一个好东西,也许是最好的,好东西是不会消亡的',
-  owner: '曲丽丽',
-  startAt: '2018-07-26 22:44',
-  progress: {
-    value: 54
-  }
-})
-data.push({
-  title: 'Ant Design',
-  avatar: 'https://gw.alipayobjects.com/zos/rmsportal/dURIMkkrRFpPgTuzkwnB.png',
-  description: '生命就像一盒巧克力,结果往往出人意料',
-  owner: '林东东',
-  startAt: '2018-07-26 22:44',
-  progress: {
-    value: 66
-  }
-})
-data.push({
-  title: 'Ant Design Pro',
-  avatar: 'https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png',
-  description: '城镇中有那么多的酒馆,她却偏偏走进了我的酒馆',
-  owner: '周星星',
-  startAt: '2018-07-26 22:44',
-  progress: {
-    value: 30
-  }
-})
-data.push({
-  title: 'Bootstrap',
-  avatar: 'https://gw.alipayobjects.com/zos/rmsportal/siCrBXXhmvTQGWPNLBow.png',
-  description: '那时候我只会想自己想要什么,从不想自己拥有什么',
-  owner: '吴加好',
-  startAt: '2018-07-26 22:44',
-  progress: {
-    status: 'exception',
-    value: 100
-  }
-})
-
-export default {
-  name: 'StandardList',
-  components: {
-    HeadInfo,
-    TaskForm
-  },
-  data () {
-    return {
-      data,
-      status: 'all'
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-    .ant-avatar-lg {
-        width: 48px;
-        height: 48px;
-        line-height: 48px;
-    }
-
-    .list-content-item {
-        color: rgba(0, 0, 0, .45);
-        display: inline-block;
-        vertical-align: middle;
-        font-size: 14px;
-        margin-left: 40px;
-        span {
-            line-height: 20px;
-        }
-        p {
-            margin-top: 4px;
-            margin-bottom: 0;
-            line-height: 22px;
-        }
-    }
-</style>

+ 0 - 280
src/views/list/TableList.vue

@@ -1,280 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="规则编号">
-              <a-input v-model="queryParam.id" placeholder=""/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="使用状态">
-              <a-select v-model="queryParam.status" placeholder="请选择" default-value="0">
-                <a-select-option value="0">全部</a-select-option>
-                <a-select-option value="1">关闭</a-select-option>
-                <a-select-option value="2">运行中</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <template v-if="advanced">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="调用次数">
-                <a-input-number v-model="queryParam.callNo" style="width: 100%"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="更新日期">
-                <a-date-picker v-model="queryParam.date" style="width: 100%" placeholder="请输入更新日期"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="使用状态">
-                <a-select v-model="queryParam.useStatus" placeholder="请选择" default-value="0">
-                  <a-select-option value="0">全部</a-select-option>
-                  <a-select-option value="1">关闭</a-select-option>
-                  <a-select-option value="2">运行中</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="使用状态">
-                <a-select placeholder="请选择" default-value="0">
-                  <a-select-option value="0">全部</a-select-option>
-                  <a-select-option value="1">关闭</a-select-option>
-                  <a-select-option value="2">运行中</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :md="!advanced && 8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-              <a @click="toggleAdvanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="$refs.createModal.add()">新建</a-button>
-      <a-button type="dashed" @click="tableOption">{{ optionAlertShow && '关闭' || '开启' }} alert</a-button>
-      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1"><a-icon type="delete" />删除</a-menu-item>
-          <!-- lock | unlock -->
-          <a-menu-item key="2"><a-icon type="lock" />锁定</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="key"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
-      <span slot="serial" slot-scope="text, record, index">
-        {{ index + 1 }}
-      </span>
-      <span slot="status" slot-scope="text">
-        <a-badge :status="text | statusTypeFilter" :text="text | statusFilter" />
-      </span>
-      <span slot="description" slot-scope="text">
-        <ellipsis :length="4" tooltip>{{ text }}</ellipsis>
-      </span>
-
-      <span slot="action" slot-scope="text, record">
-        <template>
-          <a @click="handleEdit(record)">配置</a>
-          <a-divider type="vertical" />
-          <a @click="handleSub(record)">订阅报警</a>
-        </template>
-      </span>
-    </s-table>
-    <create-form ref="createModal" @ok="handleOk" />
-    <step-by-step-modal ref="modal" @ok="handleOk"/>
-  </a-card>
-</template>
-
-<script>
-import moment from 'moment'
-import { STable, Ellipsis } from '@/components'
-import StepByStepModal from './modules/StepByStepModal'
-import CreateForm from './modules/CreateForm'
-import { getRoleList, getServiceList } from '@/api/upms/manage'
-
-const statusMap = {
-  0: {
-    status: 'default',
-    text: '关闭'
-  },
-  1: {
-    status: 'processing',
-    text: '运行中'
-  },
-  2: {
-    status: 'success',
-    text: '已上线'
-  },
-  3: {
-    status: 'error',
-    text: '异常'
-  }
-}
-
-export default {
-  name: 'TableList',
-  components: {
-    STable,
-    Ellipsis,
-    CreateForm,
-    StepByStepModal
-  },
-  data () {
-    return {
-      mdl: {},
-      // 高级搜索 展开/关闭
-      advanced: false,
-      // 查询参数
-      queryParam: {},
-      // 表头
-      columns: [
-        {
-          title: '#',
-          scopedSlots: { customRender: 'serial' }
-        },
-        {
-          title: '规则编号',
-          dataIndex: 'no'
-        },
-        {
-          title: '描述',
-          dataIndex: 'description',
-          scopedSlots: { customRender: 'description' }
-        },
-        {
-          title: '服务调用次数',
-          dataIndex: 'callNo',
-          sorter: true,
-          needTotal: true,
-          customRender: (text) => text + ' 次'
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          scopedSlots: { customRender: 'status' }
-        },
-        {
-          title: '更新时间',
-          dataIndex: 'updatedAt',
-          sorter: true
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          width: '150px',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        console.log('loadData.parameter', parameter)
-        return getServiceList(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.result
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      // custom table alert & rowSelection
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  filters: {
-    statusFilter (type) {
-      return statusMap[type].text
-    },
-    statusTypeFilter (type) {
-      return statusMap[type].status
-    }
-  },
-  created () {
-    this.tableOption()
-    getRoleList({ t: new Date() })
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: record.no === 'No 2', // Column configuration not to be checked
-                name: record.no
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-
-    handleEdit (record) {
-      console.log(record)
-      this.$refs.modal.edit(record)
-    },
-    handleSub (record) {
-      if (record.status !== 0) {
-        this.$message.info(`${record.no} 订阅成功`)
-      } else {
-        this.$message.error(`${record.no} 订阅失败,规则已关闭`)
-      }
-    },
-    handleOk () {
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    toggleAdvanced () {
-      this.advanced = !this.advanced
-    },
-    resetSearchForm () {
-      this.queryParam = {
-        date: moment(new Date())
-      }
-    }
-  }
-}
-</script>

+ 0 - 67
src/views/list/modules/CreateForm.vue

@@ -1,67 +0,0 @@
-<template>
-  <a-modal
-    title="新建规则"
-    :width="640"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-form-item
-          label="描述"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-        >
-          <a-input v-decorator="['desc', {rules: [{required: true, min: 5, message: '请输入至少五个字符的规则描述!'}]}]" />
-        </a-form-item>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 7 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 13 }
-      },
-      visible: false,
-      confirmLoading: false,
-
-      form: this.$form.createForm(this)
-    }
-  },
-  methods: {
-    add () {
-      this.visible = true
-    },
-    handleSubmit () {
-      const { form: { validateFields } } = this
-      this.confirmLoading = true
-      validateFields((errors, values) => {
-        if (!errors) {
-          console.log('values', values)
-          setTimeout(() => {
-            this.visible = false
-            this.confirmLoading = false
-            this.$emit('ok', values)
-          }, 1500)
-        } else {
-          this.confirmLoading = false
-        }
-      })
-    },
-    handleCancel () {
-      this.visible = false
-    }
-  }
-}
-</script>

+ 0 - 172
src/views/list/modules/StepByStepModal.vue

@@ -1,172 +0,0 @@
-<template>
-  <a-modal
-    title="分步对话框"
-    :width="640"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-steps :current="currentStep" :style="{ marginBottom: '28px' }" size="small">
-        <a-step title="基本信息" />
-        <a-step title="配置规则属性" />
-        <a-step title="设定调度周期" />
-      </a-steps>
-      <a-form :form="form">
-        <!-- step1 -->
-        <div v-show="currentStep === 0">
-          <a-form-item
-            label="规则名称"
-            :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-          >
-            <a-input v-decorator="['name', {rules: [{required: true}]}]" />
-          </a-form-item>
-          <a-form-item
-            label="规则描述"
-            :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-          >
-            <a-textarea :rows="4" v-decorator="['desc', {rules: [{required: true}]}]"></a-textarea>
-          </a-form-item>
-        </div>
-        <div v-show="currentStep === 1">
-          <a-form-item
-            label="监控对象"
-            :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-          >
-            <a-select v-decorator="['target', {initialValue: 0, rules: [{required: true}]}]" style="width: 100%">
-              <a-select-option :value="0">表一</a-select-option>
-              <a-select-option :value="1">表二</a-select-option>
-            </a-select>
-          </a-form-item>
-
-          <a-form-item
-            label="规则模板"
-            :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-          >
-            <a-select v-decorator="['template', { initialValue: 0, rules: [{required: true}]}]" style="width: 100%">
-              <a-select-option :value="0">规则模板一</a-select-option>
-              <a-select-option :value="1">规则模板二</a-select-option>
-            </a-select>
-          </a-form-item>
-
-          <a-form-item
-            label="规则类型"
-            :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-          >
-            <a-radio-group v-decorator="['type', {initialValue: 0, rules: [{required: true}]}]" style="width: 100%">
-              <a-radio :value="0">强</a-radio>
-              <a-radio :value="1">弱</a-radio>
-            </a-radio-group>
-          </a-form-item>
-        </div>
-
-        <div v-show="currentStep === 2">
-          <a-form-item
-            label="开始时间"
-            :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-          >
-            <a-date-picker v-decorator="['time', {rules: [{ type: 'object', required: true, message: 'Please select time!' }]}]" style="width: 100%" />
-          </a-form-item>
-          <a-form-item
-            label="调度周期"
-            :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-          >
-            <a-select v-decorator="['frequency', { initialValue: 'month', rules: [{required: true}]}]" style="width: 100%">
-              <a-select-option value="month">月</a-select-option>
-              <a-select-option value="week">周</a-select-option>
-            </a-select>
-          </a-form-item>
-        </div>
-        <!-- step1 end -->
-      </a-form>
-    </a-spin>
-    <template slot="footer">
-      <a-button key="back" @click="backward" v-if="currentStep > 0" :style="{ float: 'left' }" >上一步</a-button>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-      <a-button key="forward" :loading="confirmLoading" type="primary" @click="handleNext(currentStep)">{{ currentStep === 2 && '完成' || '下一步' }}</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import pick from 'lodash.pick'
-
-const stepForms = [
-  ['name', 'desc'],
-  ['target', 'template', 'type'],
-  ['time', 'frequency']
-]
-
-export default {
-  name: 'StepByStepModal',
-  data () {
-    return {
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 7 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 13 }
-      },
-      visible: false,
-      confirmLoading: false,
-      currentStep: 0,
-      mdl: {},
-
-      form: this.$form.createForm(this)
-    }
-  },
-  methods: {
-    edit (record) {
-      this.visible = true
-      const { form: { setFieldsValue } } = this
-      this.$nextTick(() => {
-        setFieldsValue(pick(record, []))
-      })
-    },
-    handleNext (step) {
-      const { form: { validateFields } } = this
-      const currentStep = step + 1
-      if (currentStep <= 2) {
-        // stepForms
-        validateFields(stepForms[ this.currentStep ], (errors, values) => {
-          if (!errors) {
-            this.currentStep = currentStep
-          }
-        })
-        return
-      }
-      // last step
-      this.confirmLoading = true
-      validateFields((errors, values) => {
-        console.log('errors:', errors, 'val:', values)
-        if (!errors) {
-          console.log('values:', values)
-          setTimeout(() => {
-            this.confirmLoading = false
-            this.$emit('ok', values)
-          }, 1500)
-        } else {
-          this.confirmLoading = false
-        }
-      })
-    },
-    backward () {
-      this.currentStep--
-    },
-    handleCancel () {
-      // clear form & currentStep
-      this.visible = false
-      this.currentStep = 0
-    }
-  }
-}
-</script>

+ 0 - 79
src/views/list/modules/TaskForm.vue

@@ -1,79 +0,0 @@
-<template>
-  <a-modal :width="640" :visible="visible" title="任务添加" @ok="handleSubmit" @cancel="visible = false">
-    <a-form @submit="handleSubmit" :form="form">
-      <a-form-item
-        label="任务名称"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-      >
-        <a-input v-decorator="['taskName', {rules:[{required: true, message: '请输入任务名称'}]}]" />
-      </a-form-item>
-      <a-form-item
-        label="开始时间"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-      >
-        <a-date-picker style="width: 100%" v-decorator="['startTime', {rules:[{required: true, message: '请选择开始时间'}]}]" />
-      </a-form-item>
-      <a-form-item
-        label="任务负责人"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-      >
-        <a-select v-decorator="['owner', {rules:[{required: true, message: '请选择开始时间'}]}]">
-          <a-select-option :value="0">付晓晓</a-select-option>
-          <a-select-option :value="1">周毛毛</a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item
-        label="产品描述"
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-      >
-        <a-textarea v-decorator="['desc']"></a-textarea>
-      </a-form-item>
-    </a-form>
-  </a-modal>
-</template>
-
-<script>
-export default {
-  name: 'TaskForm',
-  data () {
-    return {
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 7 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 13 }
-      },
-
-      visible: false,
-      form: this.$form.createForm(this)
-    }
-  },
-  methods: {
-    add () {
-      this.visible = true
-    },
-    edit (record) {
-      const { form: { setFieldsValue } } = this
-      this.visible = true
-      this.$nextTick(() => {
-        setFieldsValue({ taskName: 'test' })
-      })
-    },
-    handleSubmit () {
-      const { form: { validateFields } } = this
-      this.visible = true
-      validateFields((errors, values) => {
-        if (!errors) {
-          console.log('values', values)
-        }
-      })
-    }
-  }
-}
-</script>

+ 0 - 186
src/views/list/search/Applications.vue

@@ -1,186 +0,0 @@
-<template>
-  <div>
-    <a-card :bordered="false" class="ant-pro-components-tag-select">
-      <a-form :form="form" layout="inline">
-        <standard-form-row title="所属类目" block style="padding-bottom: 11px;">
-          <a-form-item>
-            <tag-select>
-              <tag-select-option value="Category1">类目一</tag-select-option>
-              <tag-select-option value="Category2">类目二</tag-select-option>
-              <tag-select-option value="Category3">类目三</tag-select-option>
-              <tag-select-option value="Category4">类目四</tag-select-option>
-              <tag-select-option value="Category5">类目五</tag-select-option>
-              <tag-select-option value="Category6">类目六</tag-select-option>
-              <tag-select-option value="Category7">类目七</tag-select-option>
-              <tag-select-option value="Category8">类目八</tag-select-option>
-              <tag-select-option value="Category9">类目九</tag-select-option>
-              <tag-select-option value="Category10">类目十</tag-select-option>
-            </tag-select>
-          </a-form-item>
-        </standard-form-row>
-
-        <standard-form-row title="其它选项" grid last>
-          <a-row>
-            <a-col :lg="8" :md="10" :sm="10" :xs="24">
-              <a-form-item :wrapper-col="{ sm: { span: 16 }, xs: { span: 24 } }" label="作者">
-                <a-select
-                  style="max-width: 200px; width: 100%;"
-                  mode="multiple"
-                  placeholder="不限"
-                  v-decorator="['author']"
-                  @change="handleChange"
-                >
-                  <a-select-option value="lisa">王昭君</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="8" :md="10" :sm="10" :xs="24">
-              <a-form-item :wrapper-col="{ sm: { span: 16 }, xs: { span: 24 } }" label="好评度">
-                <a-select
-                  style="max-width: 200px; width: 100%;"
-                  placeholder="不限"
-                  v-decorator="['rate']"
-                >
-                  <a-select-option value="good">优秀</a-select-option>
-                  <a-select-option value="normal">普通</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </standard-form-row>
-      </a-form>
-    </a-card>
-
-    <div class="ant-pro-pages-list-applications-filterCardList">
-      <a-list :loading="loading" :data-source="data" :grid="{ gutter: 24, xl: 4, lg: 3, md: 3, sm: 2, xs: 1 }" style="margin-top: 24px;">
-        <a-list-item slot="renderItem" slot-scope="item">
-          <a-card :body-style="{ paddingBottom: 20 }" hoverable>
-            <a-card-meta :title="item.title">
-              <template slot="avatar">
-                <a-avatar size="small" :src="item.avatar"/>
-              </template>
-            </a-card-meta>
-            <template slot="actions">
-              <a-tooltip title="下载">
-                <a-icon type="download" />
-              </a-tooltip>
-              <a-tooltip title="编辑">
-                <a-icon type="edit" />
-              </a-tooltip>
-              <a-tooltip title="分享">
-                <a-icon type="share-alt" />
-              </a-tooltip>
-              <a-dropdown>
-                <a class="ant-dropdown-link">
-                  <a-icon type="ellipsis" />
-                </a>
-                <a-menu slot="overlay">
-                  <a-menu-item>
-                    <a href="javascript:;">1st menu item</a>
-                  </a-menu-item>
-                  <a-menu-item>
-                    <a href="javascript:;">2nd menu item</a>
-                  </a-menu-item>
-                  <a-menu-item>
-                    <a href="javascript:;">3rd menu item</a>
-                  </a-menu-item>
-                </a-menu>
-              </a-dropdown>
-            </template>
-            <div class="">
-              <card-info active-user="100" new-user="999"></card-info>
-            </div>
-          </a-card>
-        </a-list-item>
-      </a-list>
-    </div>
-  </div>
-</template>
-
-<script>
-import moment from 'moment'
-import { TagSelect, StandardFormRow, Ellipsis, AvatarList } from '@/components'
-import CardInfo from './components/CardInfo'
-const TagSelectOption = TagSelect.Option
-const AvatarListItem = AvatarList.AvatarItem
-
-export default {
-  components: {
-    AvatarList,
-    AvatarListItem,
-    Ellipsis,
-    TagSelect,
-    TagSelectOption,
-    StandardFormRow,
-    CardInfo
-  },
-  data () {
-    return {
-      data: [],
-      form: this.$form.createForm(this),
-      loading: true
-    }
-  },
-  filters: {
-    fromNow (date) {
-      return moment(date).fromNow()
-    }
-  },
-  mounted () {
-    this.getList()
-  },
-  methods: {
-    handleChange (value) {
-      console.log(`selected ${value}`)
-    },
-    getList () {
-      this.$http.get('/list/article', { params: { count: 8 } }).then(res => {
-        console.log('res', res)
-        this.data = res.result
-        this.loading = false
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.ant-pro-components-tag-select {
-  /deep/ .ant-pro-tag-select .ant-tag {
-    margin-right: 24px;
-    padding: 0 8px;
-    font-size: 14px;
-  }
-}
-.ant-pro-pages-list-projects-cardList {
-  margin-top: 24px;
-
-  /deep/ .ant-card-meta-title {
-    margin-bottom: 4px;
-  }
-
-  /deep/ .ant-card-meta-description {
-    height: 44px;
-    overflow: hidden;
-    line-height: 22px;
-  }
-
-  .cardItemContent {
-    display: flex;
-    height: 20px;
-    margin-top: 16px;
-    margin-bottom: -4px;
-    line-height: 20px;
-
-    > span {
-      flex: 1 1;
-      color: rgba(0,0,0,.45);
-      font-size: 12px;
-    }
-
-    /deep/ .ant-pro-avatar-list {
-      flex: 0 1 auto;
-    }
-  }
-}
-</style>

+ 0 - 185
src/views/list/search/Article.vue

@@ -1,185 +0,0 @@
-<template>
-  <div>
-    <a-card :bordered="false" class="ant-pro-components-tag-select">
-      <a-form :form="form" layout="inline">
-        <standard-form-row title="所属类目" block style="padding-bottom: 11px;">
-          <a-form-item>
-            <tag-select>
-              <tag-select-option value="Category1">类目一</tag-select-option>
-              <tag-select-option value="Category2">类目二</tag-select-option>
-              <tag-select-option value="Category3">类目三</tag-select-option>
-              <tag-select-option value="Category4">类目四</tag-select-option>
-              <tag-select-option value="Category5">类目五</tag-select-option>
-              <tag-select-option value="Category6">类目六</tag-select-option>
-              <tag-select-option value="Category7">类目七</tag-select-option>
-              <tag-select-option value="Category8">类目八</tag-select-option>
-              <tag-select-option value="Category9">类目九</tag-select-option>
-              <tag-select-option value="Category10">类目十</tag-select-option>
-            </tag-select>
-          </a-form-item>
-        </standard-form-row>
-
-        <standard-form-row title="owner" grid>
-          <a-row>
-            <a-col :md="24">
-              <a-form-item :wrapper-col="{ span: 24 }">
-                <a-select
-                  style="max-width: 268px; width: 100%;"
-                  mode="multiple"
-                  placeholder="选择 onwer"
-                  v-decorator="['owner']"
-                  @change="handleChange"
-                >
-                  <a-select-option v-for="item in owners" :key="item.id">{{ item.name }}</a-select-option>
-                </a-select>
-                <a class="list-articles-trigger" @click="setOwner">只看自己的</a>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </standard-form-row>
-
-        <standard-form-row title="其它选项" grid last>
-          <a-row :gutter="16">
-            <a-col :xs="24" :sm="24" :md="12" :lg="10" :xl="8">
-              <a-form-item label="活跃用户" :wrapper-col="{ xs: 24, sm: 24, md: 12 }">
-                <a-select placeholder="不限" style="max-width: 200px; width: 100%;">
-                  <a-select-option value="李三">李三</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :xs="24" :sm="24" :md="12" :lg="10" :xl="8">
-              <a-form-item label="好评度" :wrapper-col="{ xs: 24, sm: 24, md: 12 }">
-                <a-select placeholder="不限" style="max-width: 200px; width: 100%;">
-                  <a-select-option value="优秀">优秀</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </standard-form-row>
-      </a-form>
-    </a-card>
-
-    <a-card style="margin-top: 24px;" :bordered="false">
-      <a-list
-        size="large"
-        rowKey="id"
-        :loading="loading"
-        itemLayout="vertical"
-        :dataSource="data"
-      >
-        <a-list-item :key="item.id" slot="renderItem" slot-scope="item">
-          <template slot="actions">
-            <icon-text type="star-o" :text="item.star" />
-            <icon-text type="like-o" :text="item.like" />
-            <icon-text type="message" :text="item.message" />
-          </template>
-          <a-list-item-meta>
-            <a slot="title" href="https://vue.ant.design/">{{ item.title }}</a>
-            <template slot="description">
-              <span>
-                <a-tag>Ant Design</a-tag>
-                <a-tag>设计语言</a-tag>
-                <a-tag>蚂蚁金服</a-tag>
-              </span>
-            </template>
-          </a-list-item-meta>
-          <article-list-content :description="item.description" :owner="item.owner" :avatar="item.avatar" :href="item.href" :updateAt="item.updatedAt" />
-        </a-list-item>
-        <div slot="footer" v-if="data.length > 0" style="text-align: center; margin-top: 16px;">
-          <a-button @click="loadMore" :loading="loadingMore">加载更多</a-button>
-        </div>
-      </a-list>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import { TagSelect, StandardFormRow, ArticleListContent } from '@/components'
-import IconText from './components/IconText'
-const TagSelectOption = TagSelect.Option
-
-const owners = [
-  {
-    id: 'wzj',
-    name: '我自己'
-  },
-  {
-    id: 'wjh',
-    name: '吴家豪'
-  },
-  {
-    id: 'zxx',
-    name: '周星星'
-  },
-  {
-    id: 'zly',
-    name: '赵丽颖'
-  },
-  {
-    id: 'ym',
-    name: '姚明'
-  }
-]
-
-export default {
-  components: {
-    TagSelect,
-    TagSelectOption,
-    StandardFormRow,
-    ArticleListContent,
-    IconText
-  },
-  data () {
-    return {
-      owners,
-      loading: true,
-      loadingMore: false,
-      data: [],
-      form: this.$form.createForm(this)
-    }
-  },
-  mounted () {
-    this.getList()
-  },
-  methods: {
-    handleChange (value) {
-      console.log(`selected ${value}`)
-    },
-    getList () {
-      this.$http.get('/list/article').then(res => {
-        console.log('res', res)
-        this.data = res.result
-        this.loading = false
-      })
-    },
-    loadMore () {
-      this.loadingMore = true
-      this.$http.get('/list/article').then(res => {
-        this.data = this.data.concat(res.result)
-      }).finally(() => {
-        this.loadingMore = false
-      })
-    },
-    setOwner () {
-      const { form: { setFieldsValue } } = this
-      setFieldsValue({
-        owner: ['wzj']
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.ant-pro-components-tag-select {
-  /deep/ .ant-pro-tag-select .ant-tag {
-    margin-right: 24px;
-    padding: 0 8px;
-    font-size: 14px;
-  }
-}
-
-.list-articles-trigger {
-  margin-left: 12px;
-}
-</style>

+ 0 - 168
src/views/list/search/Projects.vue

@@ -1,168 +0,0 @@
-<template>
-  <div>
-    <a-card :bordered="false" class="ant-pro-components-tag-select">
-      <a-form :form="form" layout="inline">
-        <standard-form-row title="所属类目" block style="padding-bottom: 11px;">
-          <a-form-item>
-            <tag-select>
-              <tag-select-option value="Category1">类目一</tag-select-option>
-              <tag-select-option value="Category2">类目二</tag-select-option>
-              <tag-select-option value="Category3">类目三</tag-select-option>
-              <tag-select-option value="Category4">类目四</tag-select-option>
-              <tag-select-option value="Category5">类目五</tag-select-option>
-              <tag-select-option value="Category6">类目六</tag-select-option>
-              <tag-select-option value="Category7">类目七</tag-select-option>
-              <tag-select-option value="Category8">类目八</tag-select-option>
-              <tag-select-option value="Category9">类目九</tag-select-option>
-              <tag-select-option value="Category10">类目十</tag-select-option>
-            </tag-select>
-          </a-form-item>
-        </standard-form-row>
-
-        <standard-form-row title="其它选项" grid last>
-          <a-row>
-            <a-col :lg="8" :md="10" :sm="10" :xs="24">
-              <a-form-item :wrapper-col="{ sm: { span: 16 }, xs: { span: 24 } }" label="作者">
-                <a-select
-                  style="max-width: 200px; width: 100%;"
-                  mode="multiple"
-                  placeholder="不限"
-                  v-decorator="['author']"
-                  @change="handleChange"
-                >
-                  <a-select-option value="lisa">王昭君</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="8" :md="10" :sm="10" :xs="24">
-              <a-form-item :wrapper-col="{ sm: { span: 16 }, xs: { span: 24 } }" label="好评度">
-                <a-select
-                  style="max-width: 200px; width: 100%;"
-                  placeholder="不限"
-                  v-decorator="['rate']"
-                >
-                  <a-select-option value="good">优秀</a-select-option>
-                  <a-select-option value="normal">普通</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </standard-form-row>
-      </a-form>
-    </a-card>
-
-    <div class="ant-pro-pages-list-projects-cardList">
-      <a-list :loading="loading" :data-source="data" :grid="{ gutter: 24, xl: 4, lg: 3, md: 3, sm: 2, xs: 1 }">
-        <a-list-item slot="renderItem" slot-scope="item">
-          <a-card class="ant-pro-pages-list-projects-card" hoverable>
-            <img slot="cover" :src="item.cover" :alt="item.title" />
-            <a-card-meta :title="item.title">
-              <template slot="description">
-                <ellipsis :length="50">{{ item.description }}</ellipsis>
-              </template>
-            </a-card-meta>
-            <div class="cardItemContent">
-              <span>{{ item.updatedAt | fromNow }}</span>
-              <div class="avatarList">
-                <avatar-list size="mini">
-                  <avatar-list-item
-                    v-for="(member, i) in item.members"
-                    :key="`${item.id}-avatar-${i}`"
-                    :src="member.avatar"
-                    :tips="member.name"
-                  />
-                </avatar-list>
-              </div>
-            </div>
-          </a-card>
-        </a-list-item>
-      </a-list>
-    </div>
-  </div>
-</template>
-
-<script>
-import moment from 'moment'
-import { TagSelect, StandardFormRow, Ellipsis, AvatarList } from '@/components'
-const TagSelectOption = TagSelect.Option
-const AvatarListItem = AvatarList.AvatarItem
-
-export default {
-  components: {
-    AvatarList,
-    AvatarListItem,
-    Ellipsis,
-    TagSelect,
-    TagSelectOption,
-    StandardFormRow
-  },
-  data () {
-    return {
-      data: [],
-      form: this.$form.createForm(this),
-      loading: true
-    }
-  },
-  filters: {
-    fromNow (date) {
-      return moment(date).fromNow()
-    }
-  },
-  mounted () {
-    this.getList()
-  },
-  methods: {
-    handleChange (value) {
-      console.log(`selected ${value}`)
-    },
-    getList () {
-      this.$http.get('/list/article', { params: { count: 8 } }).then(res => {
-        console.log('res', res)
-        this.data = res.result
-        this.loading = false
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.ant-pro-components-tag-select {
-  /deep/ .ant-pro-tag-select .ant-tag {
-    margin-right: 24px;
-    padding: 0 8px;
-    font-size: 14px;
-  }
-}
-.ant-pro-pages-list-projects-cardList {
-  margin-top: 24px;
-
-  /deep/ .ant-card-meta-title {
-    margin-bottom: 4px;
-  }
-
-  /deep/ .ant-card-meta-description {
-    height: 44px;
-    overflow: hidden;
-    line-height: 22px;
-  }
-
-  .cardItemContent {
-    display: flex;
-    height: 20px;
-    margin-top: 16px;
-    margin-bottom: -4px;
-    line-height: 20px;
-
-    > span {
-      flex: 1 1;
-      color: rgba(0,0,0,.45);
-      font-size: 12px;
-    }
-
-    /deep/ .ant-pro-avatar-list {
-      flex: 0 1 auto;
-    }
-  }
-}
-</style>

+ 0 - 78
src/views/list/search/SearchLayout.vue

@@ -1,78 +0,0 @@
-<template>
-  <div class="search-content">
-    <router-view />
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'SearchLayout',
-  data () {
-    return {
-      tabs: {
-        items: [
-          {
-            key: '1',
-            title: '文章'
-          },
-          {
-            key: '2',
-            title: '项目'
-          },
-          {
-            key: '3',
-            title: '应用'
-          }
-        ],
-        active: () => {
-          switch (this.$route.path) {
-            case '/list/search/article':
-              return '1'
-            case '/list/search/project':
-              return '2'
-            case '/list/search/application':
-              return '3'
-            default:
-              return '1'
-          }
-        },
-        callback: (key) => {
-          switch (key) {
-            case '1':
-              this.$router.push('/list/search/article')
-              break
-            case '2':
-              this.$router.push('/list/search/project')
-              break
-            case '3':
-              this.$router.push('/list/search/application')
-              break
-            default:
-              this.$router.push('/workplace')
-          }
-        }
-      },
-      search: true
-    }
-  },
-  computed: {
-
-  },
-  methods: {
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .search-head{
-    background-color: #fff;
-    margin: -25px -24px -24px;
-    .search-input{
-      text-align: center;
-      margin-bottom: 16px;
-    }
-  }
-  .search-content{
-    margin-top: 48px;
-  }
-</style>

+ 0 - 160
src/views/list/table/Edit.vue

@@ -1,160 +0,0 @@
-<template>
-  <div>
-    <a-form :form="form" @submit="handleSubmit">
-
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="规则编号"
-        hasFeedback
-        validateStatus="success"
-      >
-        <a-input
-          placeholder="规则编号"
-          v-decorator="[
-            'no',
-            {rules: [{ required: true, message: '请输入规则编号' }]}
-          ]"
-
-        ></a-input>
-      </a-form-item>
-
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="服务调用次数"
-        hasFeedback
-        validateStatus="success"
-      >
-        <a-input-number :min="1" style="width: 100%" v-decorator="['callNo', {rules: [{ required: true }]}]" />
-      </a-form-item>
-
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="状态"
-        hasFeedback
-        validateStatus="warning"
-      >
-        <a-select v-decorator="['status', {rules: [{ required: true, message: '请选择状态' }], initialValue: '1'}]">
-          <a-select-option :value="1">Option 1</a-select-option>
-          <a-select-option :value="2">Option 2</a-select-option>
-          <a-select-option :value="3">Option 3</a-select-option>
-        </a-select>
-      </a-form-item>
-
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="描述"
-        hasFeedback
-        help="请填写一段描述"
-      >
-        <a-textarea :rows="5" placeholder="..." v-decorator="['description', {rules: [{ required: true }]}]" />
-      </a-form-item>
-
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="更新时间"
-        hasFeedback
-        validateStatus="error"
-      >
-        <a-date-picker
-          style="width: 100%"
-          showTime
-          format="YYYY-MM-DD HH:mm:ss"
-          placeholder="Select Time"
-          v-decorator="['updatedAt']"
-        />
-      </a-form-item>
-
-      <a-form-item
-        v-bind="buttonCol"
-      >
-        <a-row>
-          <a-col span="6">
-            <a-button type="primary" html-type="submit">提交</a-button>
-          </a-col>
-          <a-col span="10">
-            <a-button @click="handleGoBack">返回</a-button>
-          </a-col>
-          <a-col span="8"></a-col>
-        </a-row>
-      </a-form-item>
-    </a-form>
-  </div>
-</template>
-
-<script>
-import moment from 'moment'
-import pick from 'lodash.pick'
-
-export default {
-  name: 'TableEdit',
-  props: {
-    record: {
-      type: [Object, String],
-      default: ''
-    }
-  },
-  data () {
-    return {
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 12 }
-      },
-      buttonCol: {
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 12, offset: 5 }
-        }
-      },
-      form: this.$form.createForm(this),
-      id: 0
-    }
-  },
-  // beforeCreate () {
-  //   this.form = this.$form.createForm(this)
-  // },
-  mounted () {
-    this.$nextTick(() => {
-      this.loadEditInfo(this.record)
-    })
-  },
-  methods: {
-    handleGoBack () {
-      this.$emit('onGoBack')
-    },
-    handleSubmit () {
-      const { form: { validateFields } } = this
-      validateFields((err, values) => {
-        if (!err) {
-          // eslint-disable-next-line no-console
-          console.log('Received values of form: ', values)
-        }
-      })
-    },
-    handleGetInfo () {
-
-    },
-    loadEditInfo (data) {
-      const { form } = this
-      // ajax
-      console.log(`将加载 ${this.id} 信息到表单`)
-      new Promise((resolve) => {
-        setTimeout(resolve, 1500)
-      }).then(() => {
-        const formData = pick(data, ['no', 'callNo', 'status', 'description', 'updatedAt'])
-        formData.updatedAt = moment(data.updatedAt)
-        console.log('formData', formData)
-        form.setFieldsValue(formData)
-      })
-    }
-  }
-}
-</script>

+ 0 - 240
src/views/list/table/List.vue

@@ -1,240 +0,0 @@
-<template>
-  <div>
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="规则编号">
-              <a-input v-model="queryParam.id" placeholder=""/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="使用状态">
-              <a-select v-model="queryParam.status" placeholder="请选择" default-value="0">
-                <a-select-option value="0">全部</a-select-option>
-                <a-select-option value="1">关闭</a-select-option>
-                <a-select-option value="2">运行中</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <template v-if="advanced">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="调用次数">
-                <a-input-number v-model="queryParam.callNo" style="width: 100%"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="更新日期">
-                <a-date-picker v-model="queryParam.date" style="width: 100%" placeholder="请输入更新日期"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="使用状态">
-                <a-select v-model="queryParam.useStatus" placeholder="请选择" default-value="0">
-                  <a-select-option value="0">全部</a-select-option>
-                  <a-select-option value="1">关闭</a-select-option>
-                  <a-select-option value="2">运行中</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="使用状态">
-                <a-select placeholder="请选择" default-value="0">
-                  <a-select-option value="0">全部</a-select-option>
-                  <a-select-option value="1">关闭</a-select-option>
-                  <a-select-option value="2">运行中</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :md="!advanced && 8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-              <a @click="toggleAdvanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="handleEdit()">新建</a-button>
-      <a-button type="dashed" @click="tableOption">{{ optionAlertShow && '关闭' || '开启' }} alert</a-button>
-      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1"><a-icon type="delete" />删除</a-menu-item>
-          <!-- lock | unlock -->
-          <a-menu-item key="2"><a-icon type="lock" />锁定</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="key"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-    >
-      <span slot="serial" slot-scope="text, record, index">
-        {{ index + 1 }}
-      </span>
-      <span slot="action" slot-scope="text, record">
-        <template>
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
-        </template>
-        <a-dropdown>
-          <a class="ant-dropdown-link">
-            更多 <a-icon type="down" />
-          </a>
-          <a-menu slot="overlay">
-            <a-menu-item>
-              <a href="javascript:;">详情</a>
-            </a-menu-item>
-            <a-menu-item v-if="$auth('table.disable')">
-              <a href="javascript:;">禁用</a>
-            </a-menu-item>
-            <a-menu-item v-if="$auth('table.delete')">
-              <a href="javascript:;">删除</a>
-            </a-menu-item>
-          </a-menu>
-        </a-dropdown>
-      </span>
-    </s-table>
-  </div>
-</template>
-
-<script>
-import moment from 'moment'
-import { STable } from '@/components'
-import { getRoleList, getServiceList } from '@/api/upms/manage'
-
-export default {
-  name: 'TableList',
-  components: {
-    STable
-  },
-  data () {
-    return {
-      mdl: {},
-      // 高级搜索 展开/关闭
-      advanced: false,
-      // 查询参数
-      queryParam: {},
-      // 表头
-      columns: [
-        {
-          title: '#',
-          scopedSlots: { customRender: 'serial' }
-        },
-        {
-          title: '规则编号',
-          dataIndex: 'no'
-        },
-        {
-          title: '描述',
-          dataIndex: 'description'
-        },
-        {
-          title: '服务调用次数',
-          dataIndex: 'callNo',
-          sorter: true,
-          needTotal: true,
-          customRender: (text) => text + ' 次'
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          needTotal: true
-        },
-        {
-          title: '更新时间',
-          dataIndex: 'updatedAt',
-          sorter: true
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          width: '150px',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        console.log('loadData.parameter', parameter)
-        return getServiceList(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.result
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      // custom table alert & rowSelection
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    this.tableOption()
-    getRoleList({ t: new Date() })
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-
-    handleEdit (record) {
-      this.$emit('onEdit', record)
-    },
-    handleOk () {
-
-    },
-
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    toggleAdvanced () {
-      this.advanced = !this.advanced
-    },
-
-    resetSearchForm () {
-      this.queryParam = {
-        date: moment(new Date())
-      }
-    }
-  }
-}
-</script>

+ 0 - 444
src/views/mobile/AnalysisLiquidate.vue

@@ -1,444 +0,0 @@
-<template>
-  <div class="page-header-index-wide">
-    <a-row :gutter="24" type="flex">
-      <a-col :xl="6" :lg="24" :md="24" :sm="24" :xs="24">
-        <a-card title="清收任务分析" :style="{padding: '0px',marginBottom:'0px'}">
-          <a-card
-            title="年度累计完成额"
-            :style="{ marginTop: '0px'}">
-            <div
-              style="cursor: pointer"
-              @click="jumpClick()">
-              <h2>{{ newAmountTaskYearlyAmount }}</h2>
-              <trend style="margin-right: 16px;" :flag="'no'">
-                <span slot="term"><badge text="任务" status="success"/></span>
-                {{ BaseTool.Amount.defaultDivTenThousandFormatter(newAmountTaskYearly.newAmount) }}万
-              </trend>
-              <trend :flag="'no'">
-                <span slot="term"><badge text="完成率" status="error"/></span>
-                {{ BaseTool.Amount.default(newAmountTaskYearly.ratio) }}%
-              </trend>
-            </div>
-          </a-card>
-          <a-card
-            title="本月完成额"
-            :style="{ marginTop: '0px' }">
-
-            <div
-              style="cursor: pointer"
-              @click="jumpClick()">
-              <h2>{{ newAmountTaskMonthAmount }}</h2>
-              <trend style="margin-right: 16px;" :flag="'no'">
-                <span slot="term"><badge text="任务" status="success"/></span>
-                {{ BaseTool.Amount.defaultDivTenThousandFormatter(newAmountTaskMonth.newAmount) }}万
-              </trend>
-              <trend :flag="'no'">
-                <span slot="term"><badge text="完成率" status="error"/></span>
-                {{ BaseTool.Amount.default(newAmountTaskMonth.ratio) }}%
-              </trend>
-            </div>
-          </a-card>
-        </a-card>
-      </a-col>
-      <a-col :xl="18" :lg="24" :md="24" :sm="24" :xs="24">
-        <a-card
-          :loading="loading"
-          :bordered="false"
-          :body-style="{padding: '0'}"
-        >
-          <div class="salesCard">
-            <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-              <a-tab-pane loading="true" tab="清收任务完成统计(任务+完成)" key="1">
-                <a-row>
-                  <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-                    <label style="padding-left: 10px">年份区间:</label>
-                    <a-select placeholder="开始年份" v-model="startYear" style="width: 35%">
-                      <a-select-option
-                        v-for="(value,index) in years"
-                        :key="index"
-                        :label="value"
-                        :value="value">{{ value }}</a-select-option>
-                    </a-select>
-                    ~
-                    <a-select placeholder="结束年份" v-model="endYear" style="width: 35%">
-                      <a-select-option
-                        v-for="(value,index) in years"
-                        :key="index"
-                        :label="value"
-                        :value="value">{{ value }}</a-select-option>
-                    </a-select>
-                  </a-col>
-                  <a-col
-                    :xl="24"
-                    :lg="24"
-                    :md="24"
-                    :sm="24"
-                    :xs="24"
-                    style="margin-top: 10px">
-                    <label style="padding-left: 10px">统计维度:</label>
-                    <a-select placeholder="请选择" v-model="type" style="width: 20%">
-                      <a-select-option
-                        v-for="(label,value) in yearlyTaskTypeDict"
-                        :key="value"
-                        :label="label"
-                        :value="parseInt(value)">{{ label }}
-                      </a-select-option>
-                    </a-select>
-                    <a-button type="primary" @click="taskAnalysis()" style="margin-left:10px;margin-right: 15px">查询</a-button>
-                  </a-col>
-                </a-row>
-                <a-row>
-                  <a-col class="chart_col">
-                    <div>
-                      <h4 style="margin-bottom: 20px; margin-left: 20px; display: inline-block">清收任务统计</h4>
-                      <h4 class="chart_wy_h4">万元</h4>
-                      <v-chart
-                        class="chart"
-                        :forceFit="true"
-                        :height="height"
-                        :data="newAmountDatas1"
-                        :scale="scale1"
-                        :padding="['auto', '50', '80', '100']">
-                        <v-tooltip />
-                        <v-legend
-                          :custom="legendCustom"
-                          :allow-all-canceled="legendAllowAllCanceled"
-                          :items="legendItems1"
-                          :on-click="legendOnClick"
-                        />
-                        <v-axis
-                          data-key="ratio"
-                          :grid="axisGrid"
-                          position="right"
-                          :label="axisLabel"
-                        />
-                        <v-bar position="targetName*amount" color="name" :adjust="adjust"/>
-
-                        <v-smooth-line position="targetName*ratio" color="#e6b600" :size="gemoSize" />
-                        <v-point shape="circle" position="targetName*ratio" color="#e6b600" :size="gemoSize" />
-                      </v-chart>
-                    </div>
-                  </a-col>
-
-                </a-row>
-                <a-row>
-                  <a-col class="chart_col">
-                    <div>
-                      <h4 style="margin-bottom: 20px; margin-left: 20px; display: inline-block">累计清收任务统计</h4>
-                      <h4 class="chart_wy_h4">万元</h4>
-                      <v-chart
-                        class="chart"
-                        :forceFit="true"
-                        :height="height"
-                        :data="newAmountDatas2"
-                        :scale="scale2"
-                        :padding="['auto', '50', '80', '100']">
-                        <v-tooltip />
-                        <v-legend
-                          :custom="legendCustom"
-                          :allow-all-canceled="legendAllowAllCanceled"
-                          :items="legendItems2"
-                          :on-click="legendOnClick"
-                        />
-                        <v-axis
-                          data-key="ratio"
-                          :grid="axisGrid"
-                          position="right"
-                          :label="axisLabel"
-                        />
-                        <v-bar position="targetName*amount" color="name" :adjust="adjust"/>
-                        <v-smooth-line position="targetName*ratio" color="#e6b600" :size="gemoSize" />
-                        <v-point shape="circle" position="targetName*ratio" color="#e6b600" :size="gemoSize" />
-                      </v-chart>
-                    </div>
-                  </a-col>
-
-                </a-row>
-                <a-row>
-                  <a-col class="chart_col">
-                    <div @click="jumpClick()">
-                      <h4 style="margin-bottom: 20px; margin-left: 20px; display: inline-block">年度清收任务统计</h4>
-                      <h4 class="chart_wy_h4">万元</h4>
-                      <v-chart
-                        class="chart"
-                        :forceFit="true"
-                        :height="height"
-                        :data="newAmountDatas3"
-                        :scale="scale3"
-                        :padding="['auto', '50', '80', '100']">
-                        <v-tooltip />
-                        <v-legend
-                          :custom="legendCustom"
-                          :allow-all-canceled="legendAllowAllCanceled"
-                          :items="legendItems3"
-                          :on-click="legendOnClick"
-                        />
-                        <v-axis
-                          data-key="ratio"
-                          :grid="axisGrid"
-                          position="right"
-                          :label="axisLabel"
-                        />
-                        <v-bar position="targetName*amount" color="name" :adjust="adjust"/>
-                        <v-smooth-line position="targetName*ratio" color="#e6b600" :size="gemoSize" />
-                        <v-point shape="circle" position="targetName*ratio" color="#e6b600" :size="gemoSize" />
-                      </v-chart>
-                    </div>
-                  </a-col>
-
-                </a-row>
-              </a-tab-pane>
-
-            </a-tabs>
-          </div>
-        </a-card>
-      </a-col>
-
-    </a-row>
-  </div>
-</template>
-
-<script>
-import { ChartCard, MiniArea, MiniBar, MiniProgress, RankList, Bar, Trend, NumberInfo, MiniSmoothArea } from '@/components'
-import { mixinDevice } from '@/utils/mixin'
-
-export default {
-  name: 'AnalysisLiquidateNew',
-  mixins: [mixinDevice],
-  components: {
-    ChartCard,
-    MiniArea,
-    MiniBar,
-    MiniProgress,
-    RankList,
-    Bar,
-    Trend,
-    NumberInfo,
-    MiniSmoothArea
-  },
-  data () {
-    return {
-      loading: true,
-
-      scale1: [{
-        dataKey: 'amount',
-        min: 0,
-        formatter: function formatter (text) {
-          return text
-        }
-      }, {
-        dataKey: 'ratio',
-        alias: '完成比例',
-        min: 0,
-        formatter: function formatter (text) {
-          return text + '%'
-        }
-      }],
-      scale2: [{
-        dataKey: 'amount',
-        min: 0,
-        formatter: function formatter (text) {
-          return text
-        }
-      }, {
-        dataKey: 'ratio',
-        alias: '累计完成比例',
-        min: 0,
-        formatter: function formatter (text) {
-          return text + '%'
-        }
-      }],
-      scale3: [{
-        dataKey: 'amount',
-        min: 0,
-        formatter: function formatter (text) {
-          return text
-        }
-      }, {
-        dataKey: 'ratio',
-        alias: '年度完成比例',
-        min: 0,
-        formatter: function formatter (text) {
-          return text + '%'
-        }
-      }],
-
-      height: 400,
-
-      axisLabel: {
-        textStyle: {
-          fill: '#fdae6b'
-        }
-      },
-      axisGrid: null,
-
-      gemoSize: 3,
-      adjust: [{
-        type: 'dodge',
-        marginRatio: 1 / 32
-      }],
-
-      legendCustom: true,
-      legendAllowAllCanceled: true,
-      legendItems1: [
-        { value: '任务额', marker: { symbol: 'square', fill: '#38A0FF', radius: 5 } },
-        { value: '完成额', marker: { symbol: 'square', fill: '#4CCA73', radius: 5 } },
-        { value: '完成比例', marker: { symbol: 'hyphen', stroke: '#e6b600', radius: 5, lineWidth: 3 } }
-      ],
-      legendItems2: [
-        { value: '累计任务额', marker: { symbol: 'square', fill: '#38A0FF', radius: 5 } },
-        { value: '累计完成额', marker: { symbol: 'square', fill: '#4CCA73', radius: 5 } },
-        { value: '完成比例', marker: { symbol: 'hyphen', stroke: '#e6b600', radius: 5, lineWidth: 3 } }
-      ],
-      legendItems3: [
-        { value: '年度任务额', marker: { symbol: 'square', fill: '#38A0FF', radius: 5 } },
-        { value: '完成额', marker: { symbol: 'square', fill: '#4CCA73', radius: 5 } },
-        { value: '完成比例', marker: { symbol: 'hyphen', stroke: '#e6b600', radius: 5, lineWidth: 3 } }
-      ],
-      legendOnClick: (ev, chart) => {
-        const item = ev.item
-        const value = item.value
-        const checked = ev.checked
-        const geoms = chart.getAllGeoms()
-        for (let i = 0; i < geoms.length; i++) {
-          const geom = geoms[i]
-          if (geom.getYScale().field === value) {
-            if (checked) {
-              geom.show()
-            } else {
-              geom.hide()
-            }
-          }
-        }
-      },
-
-      yearlyTaskTypeDict: {},
-      newAmountTaskYearly: {
-        amount: 0,
-        newAmount: 0,
-        ratio: 0
-      },
-      newAmountTaskMonth: {
-        amount: 0,
-        newAmount: 0,
-        ratio: 0
-      },
-      type: 3,
-      year: parseInt(this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR)),
-      month: parseInt(this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_MONTH)),
-      newAmountDatas2: [],
-      newAmountDatas1: [],
-      newAmountDatas3: [],
-      startYear: parseInt(this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR)),
-      endYear: parseInt(this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR)),
-      years: []
-
-    }
-  },
-  created () {
-    setTimeout(() => {
-      this.loading = !this.loading
-    }, 1000)
-    this.yearlyTaskTypeDict = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YEARLY_TASK_TYPE)
-
-    this.taskAnalysis()
-    this.init()
-  },
-  computed: {
-    newAmountTaskYearlyAmount: function () {
-      return `¥${this.BaseTool.Amount.defaultDivTenThousandFormatter(this.newAmountTaskYearly.amount)}万`
-    },
-    newAmountTaskMonthAmount: function () {
-      return `¥${this.BaseTool.Amount.defaultDivTenThousandFormatter(this.newAmountTaskMonth.amount)}万`
-    }
-  },
-  methods: {
-    taskAnalysis () {
-      this.newAmountDatas1 = []
-      this.newAmountDatas2 = []
-      this.newAmountDatas3 = []
-    },
-    getTargetName (item) {
-      return ((this.startYear === this.endYear || this.type === 1) ? '' : (item.year + '年')) + item.targetName + this.yearlyTaskTypeDict[item.type]
-    },
-    init () {
-      const year = parseInt(this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR))
-      const years = []
-      for (let i = year + 1; i >= 2018; i--) {
-        years.push(i)
-      }
-      this.years = years
-    },
-    jumpClick () {
-      return false
-      // this.$router.push({ path: '/invest/loan/liquidate' })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .extra-wrapper {
-    line-height: 55px;
-    padding-right: 24px;
-
-    .extra-item {
-      display: inline-block;
-      margin-right: 24px;
-
-      a {
-        margin-left: 24px;
-      }
-    }
-  }
-
-  .antd-pro-pages-dashboard-analysis-twoColLayout {
-    position: relative;
-    display: flex;
-    display: block;
-    flex-flow: row wrap;
-  }
-
-  .antd-pro-pages-dashboard-analysis-salesCard {
-    height: calc(100% - 24px);
-    /deep/ .ant-card-head {
-      position: relative;
-    }
-  }
-
-  .dashboard-analysis-iconGroup {
-    i {
-      margin-left: 16px;
-      color: rgba(0,0,0,.45);
-      cursor: pointer;
-      transition: color .32s;
-      color: black;
-    }
-  }
-  .analysis-salesTypeRadio {
-    position: absolute;
-    right: 54px;
-    bottom: 12px;
-  }
-  .chart_wy_h4 {
-    float: right;
-    margin-bottom: 20px;
-    margin-right: 10px;
-    display: inline-block
-  }
-  @media screen and (max-width: 500px) {
-    .chart_col {
-      width: 110%;
-    }
-    .chart{
-      position: relative;
-      left: -45px;
-    }
-    .chart_wy_h4{
-      float: right;
-      margin-bottom: 20px;
-      margin-right:11%;
-      display: inline-block
-    }
-  }
-</style>

+ 0 - 35
src/views/monthly/sb-three-rate/MonthlySbThreeRateView.vue

@@ -1,35 +0,0 @@
-<template>
-  <a-collapse v-model="collapseActiveKey">
-    <a-collapse-panel key="1" header="列表">
-      <monthly-sb-three-rate />
-    </a-collapse-panel>
-    <a-collapse-panel key="2" header="统计图">
-      <monthly-sb-three-rate-chart />
-    </a-collapse-panel>
-  </a-collapse>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import MonthlySbThreeRate from '@/views/monthly/sb-three-rate/modules/MonthlySbThreeRate'
-import MonthlySbThreeRateChart from '@/views/monthly/sb-three-rate/modules/MonthlySbThreeRateChart'
-export default {
-  name: 'MonthlySbThreeRateList',
-  components: {
-    STable,
-    MonthlySbThreeRate,
-    MonthlySbThreeRateChart,
-    Ellipsis
-  },
-  data () {
-    return {
-      // 查询参数
-      collapseActiveKey: 1
-    }
-  },
-  created () {
-  },
-  methods: {
-  }
-}
-</script>

+ 0 - 177
src/views/monthly/sb-three-rate/modules/BaseForm.vue

@@ -1,177 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @cancel="handleCancel"
-  >
-    <a-form :form="form">
-      <row-list :col="1" v-show="false">
-        <row-item>
-          <a-form-item>
-            <a-input v-decorator="['id']" type="hidden"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-      <row-list :col="1">
-        <row-item>
-          <a-form-item
-            label="年份"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              style="width: 100%"
-              :min="1"
-              v-decorator="['year', {rules: [{required: true, message: '年份不能为空'}]}]"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="月份"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              style="width: 100%"
-              :min="1"
-              v-decorator="['month', {rules: [{required: true, message: '月份不能为空'}]}]"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="完好数"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              style="width: 100%"
-              :min="1"
-              v-decorator="['intactNum', {rules: [{required: true, message: '完好数不能为空'}]}]"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="待修数"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              style="width: 100%"
-              :min="1"
-              v-decorator="['repairNum', {rules: [{required: true, message: '待修数不能为空'}]}]"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="事故数"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              style="width: 100%"
-              :min="1"
-              v-decorator="['accidentNum', {rules: [{required: true, message: '事故数不能为空'}]}]"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="总数"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              style="width: 100%"
-              :min="1"
-              v-decorator="['sumNum', {rules: [{required: true, message: '总数不能为空'}]}]"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-    </a-form>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import pick from 'lodash.pick'
-import { addMonthlySbThreeRate, updateMonthlySbThreeRate } from '@/api/monthly/sb-three-rate'
-
-export default {
-  name: 'BaseMonthlySbThreeRate',
-  data () {
-    return {
-      confirmLoading: false,
-      modalTitle: null,
-      form: this.$form.createForm(this),
-      visible: false
-      // 下拉框map
-    }
-  },
-  props: {},
-  created () {
-    // 下拉框map
-  },
-  methods: {
-    base (record) {
-      this.visible = true
-      // 如果是空标识添加
-      if (this.BaseTool.Object.isBlank(record)) {
-        this.modalTitle = '添加'
-        return
-      }
-      this.modalTitle = '编辑'
-      const { form: { setFieldsValue } } = this
-      // 日期处理
-      this.$nextTick(() => {
-        setFieldsValue(Object.assign(pick(record, [
-          'id',
-          'year',
-          'month',
-          'intactNum',
-          'repairNum',
-          'accidentNum',
-          'sumNum'
-        ])))
-      })
-    },
-    save () {
-      const { form: { validateFieldsAndScroll } } = this
-      this.confirmLoading = true
-      validateFieldsAndScroll((errors, values) => {
-        if (errors) {
-          this.confirmLoading = false
-          return
-        }
-        // 日期处理
-        if (this.BaseTool.String.isBlank(values.id)) {
-          addMonthlySbThreeRate(values)
-            .then(() => {
-              this.handleCancel(values)
-            }).catch(() => {
-              this.confirmLoading = false
-            })
-        } else {
-          updateMonthlySbThreeRate(values)
-            .then(() => {
-              this.handleCancel(values)
-            }).catch(() => {
-              this.confirmLoading = false
-            })
-        }
-      })
-    },
-    handleCancel (values) {
-      this.visible = false
-      this.confirmLoading = false
-      this.form.resetFields()
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok', values)
-      }
-    }
-
-  }
-}
-</script>

+ 0 - 75
src/views/monthly/sb-three-rate/modules/Detail.vue

@@ -1,75 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="850"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @cancel="handleCancel"
-  >
-    <detail-list title="" :col="2">
-      <detail-list-item term="年份">{{ model.year }}</detail-list-item>
-      <detail-list-item term="月份">{{ model.month }}</detail-list-item>
-      <detail-list-item term="完好数">{{ model.intactNum }}</detail-list-item>
-      <detail-list-item term="待修数">{{ model.repairNum }}</detail-list-item>
-      <detail-list-item term="事故数">{{ model.accidentNum }}</detail-list-item>
-      <detail-list-item term="总数">{{ model.sumNum }}</detail-list-item>
-      <detail-list-item term="添加人ID">{{ model.createdUserId }}</detail-list-item>
-      <detail-list-item term="最后修改用户ID">{{ model.updateUserId }}</detail-list-item>
-      <detail-list-item term="最后修改时间">{{ model.updateTime }}</detail-list-item>
-      <detail-list-item term="修改人名称">{{ model.updateUserName }}</detail-list-item>
-    </detail-list>
-
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import DetailList from '@/components/tools/DetailList'
-const DetailListItem = DetailList.Item
-
-export default {
-  name: 'MonthlySbThreeRateDetail',
-  components: {
-    DetailList,
-    DetailListItem
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      mdl: {},
-      modalTitle: null,
-      visible: false,
-      // 下拉框map
-      model: {
-        'year': null,
-        'month': null,
-        'intactNum': null,
-        'repairNum': null,
-        'accidentNum': null,
-        'sumNum': null,
-        'createdUserId': null,
-        'updateUserId': null,
-        'updateTime': null,
-        'updateUserName': null
-      }
-    }
-  },
-  created () {
-    // 下拉框map
-  },
-  methods: {
-    base (record) {
-      this.visible = true
-      this.modalTitle = '详情'
-      this.model = record
-    },
-    handleCancel () {
-      this.visible = false
-      this.confirmLoading = false
-    }
-
-  }
-}
-</script>

+ 0 - 276
src/views/monthly/sb-three-rate/modules/MonthlySbThreeRate.vue

@@ -1,276 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="关键字">
-              <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator">
-      <a-button v-if="$auth('monthly-sb-three-rates-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-      <a-button style="margin-left: 8px" v-if="$auth('monthly-sb-three-rates-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('monthly-sb-three-rates-del')">
-        <a-menu slot="overlay">
-          <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
-            <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-          </a-popconfirm>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
-      <span slot="action" slot-scope="record">
-        <template>
-          <a @click="handleView(record)">查看</a>
-          <operation-button
-            v-if="$auth('monthly-sb-three-rates-edit')"
-            @click="handleEdit(record)"
-          >修改</operation-button>
-          <operation-button
-            v-if="$auth('monthly-sb-three-rates-del')"
-            :type="2"
-            title="是否要删除该条数据?"
-            @confirm="batchDelete(record.id)">删除</operation-button>
-        </template>
-      </span>
-    </s-table>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <detail ref="detailModal"/>
-  </a-card>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './BaseForm'
-import Detail from './Detail'
-import { getMonthlySbThreeRatePage, deleteMonthlySbThreeRates, fetchMonthlySbThreeRate, exportMonthlySbThreeRate } from '@/api/monthly/sb-three-rate'
-
-export default {
-  name: 'MonthlySbThreeRateList',
-  components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    Detail
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-      },
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          checked: true,
-          dataIndex: 'index',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '年份',
-          checked: true,
-          dataIndex: 'year',
-          customRender: (text, record, index) => {
-            return text + '年'
-          }
-        },
-        {
-          title: '月份',
-          checked: true,
-          dataIndex: 'month',
-          customRender: (text, record, index) => {
-            return text + '月'
-          }
-        },
-        {
-          title: '完好数',
-          checked: true,
-          dataIndex: 'intactNum'
-        },
-        {
-          title: '待修数',
-          checked: true,
-          dataIndex: 'repairNum'
-        },
-        {
-          title: '事故数',
-          checked: true,
-          dataIndex: 'accidentNum'
-        },
-        {
-          title: '总数',
-          checked: true,
-          dataIndex: 'sumNum'
-        },
-        {
-          title: '完好率',
-          checked: true,
-          dataIndex: 'intactRate',
-          customRender: (text, record, index) => {
-            return text + '%'
-          }
-        },
-        {
-          title: '待修率',
-          checked: true,
-          dataIndex: 'repairRate',
-          customRender: (text, record, index) => {
-            return text + '%'
-          }
-        },
-        {
-          title: '事故率',
-          checked: true,
-          dataIndex: 'accidentRate',
-          customRender: (text, record, index) => {
-            return text + '%'
-          }
-        }
-        // {
-        //   title: '操作',
-        //   key: 'action',
-        //   width: '200px',
-        //   align: 'center',
-        //   scopedSlots: { customRender: 'action' }
-        // }
-      ],
-      // 下拉框map
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam,
-          dataScope: {
-            sortBy: 'desc',
-            sortName: 'update_time'
-          }
-        }
-        return getMonthlySbThreeRatePage(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    // 下拉框map
-    this.tableOption()
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: false,
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteMonthlySbThreeRates(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchMonthlySbThreeRate({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchMonthlySbThreeRate({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportMonthlySbThreeRate(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleEnter () {
-      this.$refs.table.refresh(true)
-    }
-  }
-}
-</script>

+ 0 - 233
src/views/monthly/sb-three-rate/modules/MonthlySbThreeRateChart.vue

@@ -1,233 +0,0 @@
-<template>
-  <div class="page-header-index-wide">
-    <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
-      <div class="salesCard">
-        <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-          <a-tab-pane loading="true" tab="三率分析数量统计" key="1">
-            <a-row>
-              <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-                <!--<bar :data="barData" :scale="scale" title="变化曲线" />-->
-                <div :style="{ padding: '0 10px 32px 32px' }">
-                  <h4 :style="{ marginBottom: '20px' }">三率分析数量统计</h4>
-                  <v-chart :forceFit="true" :height="height" :data="barData" :scale="scale" :padding="['auto', '100', '80', '100']">
-                    <v-tooltip />
-                    <v-legend />
-                    <v-axis />
-                    <v-bar position="targetName*num" color="name" :adjust="adjust"/>
-                  </v-chart>
-                </div>
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-        </a-tabs>
-      </div>
-    </a-card>
-
-  </div>
-</template>
-
-<script>
-import { ChartCard, MiniArea, MiniBar, MiniProgress, RankList, Bar, Trend, NumberInfo, MiniSmoothArea } from '@/components'
-import { mixinDevice } from '@/utils/mixin'
-import { queryMonthlySbThreeRate } from '@/api/monthly/sb-three-rate'
-
-export default {
-  name: 'Analysis',
-  mixins: [mixinDevice],
-  components: {
-    ChartCard,
-    MiniArea,
-    MiniBar,
-    MiniProgress,
-    RankList,
-    Bar,
-    Trend,
-    NumberInfo,
-    MiniSmoothArea
-  },
-  data () {
-    return {
-      weekSearchFlag: false,
-      monthSearchFlag: false,
-      dateRange: [],
-      loading: true,
-      height: 400,
-      legendCustom: true,
-      legendAllowAllCanceled: true,
-      axisGrid: null,
-      axisLabel: {
-        textStyle: {
-          fill: '#fdae6b'
-        }
-      },
-      adjust: [{
-        type: 'dodge',
-        marginRatio: 1 / 32
-      }],
-      gemoSize: 3,
-      scale: [{
-        dataKey: 'num',
-        min: 0,
-        formatter: function formatter (text) {
-          return text
-        }
-      }],
-      // 搜索用户数
-
-      barData: [],
-
-      pieStyle: {
-        stroke: '#fff',
-        lineWidth: 1
-      },
-      year: parseInt(this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR)),
-      month: parseInt(this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_MONTH)),
-      startYear: parseInt(this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR)),
-      endYear: parseInt(this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR))
-    }
-  },
-  computed: {
-  },
-  created () {
-    setTimeout(() => {
-      this.loading = !this.loading
-    }, 1000)
-
-    this.init()
-  },
-  methods: {
-    searchData (type, e) {
-      this.weekSearchFlag = false
-      this.monthSearchFlag = false
-      if (type === 1) {
-        this.dateRange = []
-        this.weekSearchFlag = true
-      }
-      if (type === 2) {
-        this.dateRange = []
-        this.monthSearchFlag = true
-      }
-      if (type === 3) {
-        if (this.BaseTool.Object.isBlank(this.dateRange) || this.dateRange.length < 2) {
-          this.$message.error('请输入筛选时间')
-          return
-        }
-        const startDate = this.dateRange[0]
-        const endDate = this.dateRange[1]
-        if (this.BaseTool.Object.isBlank(startDate) || this.BaseTool.Object.isBlank(endDate)) {
-          this.$message.error('请输入筛选时间')
-          return
-        }
-        const diffDays = endDate.diff(startDate, 'days') + 1
-        if (diffDays > 31) {
-          this.$message.error('搜索时间最大不能超过31天')
-        }
-      }
-      // e.toElement.innerHTML = '<span>11</span>'
-    },
-    init () {
-      queryMonthlySbThreeRate({ year: this.year }).then(res => {
-        console.log(33, res)
-        const barData = []
-        const dataMap = {}
-        res.data.forEach(item => {
-          dataMap[item.month] = item
-        })
-        for (let i = 0; i < 12; i++) {
-          const item = dataMap[i + 1]
-          if (this.BaseTool.Object.isBlank(item)) {
-            barData.push({
-              name: '完好数',
-              targetName: this.year + '年' + (i + 1) + '月',
-              num: 0
-            })
-            barData.push({
-              name: '待修数',
-              targetName: this.year + '年' + (i + 1) + '月',
-              num: 0
-            })
-            barData.push({
-              name: '事故数',
-              targetName: this.year + '年' + (i + 1) + '月',
-              num: 0
-            })
-            barData.push({
-              name: '总数',
-              targetName: this.year + '年' + (i + 1) + '月',
-              num: 0
-            })
-          } else {
-            barData.push({
-              name: '总数',
-              targetName: this.year + '年' + item.month + '月',
-              num: item.sumNum
-            })
-            barData.push({
-              name: '完好数',
-              targetName: this.year + '年' + item.month + '月',
-              num: item.intactNum
-            })
-            barData.push({
-              name: '待修数',
-              targetName: this.year + '年' + item.month + '月',
-              num: item.repairNum
-            })
-            barData.push({
-              name: '事故数',
-              targetName: this.year + '年' + item.month + '月',
-              num: item.accidentNum
-            })
-          }
-        }
-        this.barData = barData
-      })
-    }
-  }
-
-}
-</script>
-
-<style lang="less" scoped>
-  .extra-wrapper {
-    line-height: 55px;
-    padding-right: 24px;
-
-    .extra-item {
-      display: inline-block;
-      margin-right: 24px;
-
-      a {
-        margin-left: 24px;
-      }
-    }
-  }
-
-  .antd-pro-pages-dashboard-analysis-twoColLayout {
-    position: relative;
-    display: flex;
-    display: block;
-    flex-flow: row wrap;
-  }
-
-  .antd-pro-pages-dashboard-analysis-salesCard {
-    height: calc(100% - 24px);
-    /deep/ .ant-card-head {
-      position: relative;
-    }
-  }
-
-  .dashboard-analysis-iconGroup {
-    i {
-      margin-left: 16px;
-      color: rgba(0,0,0,.45);
-      cursor: pointer;
-      transition: color .32s;
-      color: black;
-    }
-  }
-  .analysis-salesTypeRadio {
-    position: absolute;
-    right: 54px;
-    bottom: 12px;
-  }
-</style>

+ 0 - 288
src/views/monthly/sb-three-rate/modules/MonthlySbThreeRateSelectModal.vue

@@ -1,288 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="1000"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    class="ant-modal2"
-    @cancel="handleCancel"
-  >
-    <a-card :bordered="false">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="关键字">
-                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8 || 24" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              </span>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-
-      <div class="table-operator">
-      </div>
-
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :alert="options.alert"
-        :customRow="options.customRow"
-        :rowSelection="options.rowSelection"
-        showPagination="auto"
-      >
-        <span slot="action" slot-scope="record1">
-          <template>
-            <a @click="handleView(record1)">查看</a>
-          </template>
-        </span>
-      </s-table>
-      <detail ref="detailModal"/>
-    </a-card>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">取消</a-button>
-      <a-button :loading="confirmLoading" type="primary" @click="handleSelect()">确定</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import Detail from './Detail'
-import { getMonthlySbThreeRatePage, fetchMonthlySbThreeRate } from '@/api/monthly/sb-three-rate'
-
-export default {
-  name: 'MonthlySbThreeRateSelectModal',
-  components: {
-    STable,
-    Ellipsis,
-    Detail
-  },
-  props: {
-    type: {
-      type: String,
-      default: 'radio'
-    },
-    selectedRowKey: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    selectedRow: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    }
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      mdl: {},
-      modalTitle: null,
-      visible: false,
-      record: null,
-      // 查询参数
-      queryParam: {
-      },
-      extraQueryParam: {
-      },
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '年份',
-          dataIndex: 'year'
-        },
-        {
-          title: '月份',
-          dataIndex: 'month'
-        },
-        {
-          title: '完好数',
-          dataIndex: 'intactNum'
-        },
-        {
-          title: '待修数',
-          dataIndex: 'repairNum'
-        },
-        {
-          title: '事故数',
-          dataIndex: 'accidentNum'
-        },
-        {
-          title: '总数',
-          dataIndex: 'sumNum'
-        },
-        {
-          title: '添加时间',
-          dataIndex: 'createdTime'
-        },
-        {
-          title: '创建人名称',
-          dataIndex: 'createdUserName'
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam,
-          ...this.extraQueryParam,
-          dataScope: {
-            sortBy: 'desc',
-            sortName: 'update_time'
-          }
-        }
-        return getMonthlySbThreeRatePage(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false,
-      isCreated: false
-    }
-  },
-  created () {
-    // 下拉框map
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            type: this.type,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: false,
-                name: record.id
-              }
-            })
-          },
-          customRow: (record) => {
-            return {
-              on: { // 事件
-                click: (event) => { // 点击行
-                  // 选择对象
-                  this.mySelect([record.id], [record])
-                },
-                dblclick: (event) => {
-                  this.mySelect([record.id], [record])
-                  this.handleSelect()
-                }
-              }
-            }
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    handleView (record) {
-      fetchMonthlySbThreeRate({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    base (record, queryParam = {}) {
-      this.visible = true
-      this.modalTitle = '选择信息'
-      this.extraQueryParam = queryParam
-      this.record = record
-      if (this.isCreated) {
-        this.$refs.table.clearSelected()
-        this.options.rowSelection.type = this.type
-        this.handleOk()
-      } else {
-        this.tableOption()
-        this.isCreated = true
-      }
-    },
-    handleCancel () {
-      this.visible = false
-      this.confirmLoading = false
-    },
-    handleSelect () {
-      if (this.selectedRowKeys.length === 0) {
-        this.$message.warn('请至少选择一项信息')
-      } else {
-        this.confirmLoading = true
-        this.$emit('selected', this.record, this.selectedRowKeys, this.selectedRows)
-        this.confirmLoading = false
-        this.visible = false
-      }
-    },
-    mySelect (selectedRowKeys, selectedRows) {
-      if (this.type === 'radio') {
-        this.$refs.table.updateSelect(selectedRowKeys, selectedRows)
-        this.$refs.table.rowSelection.onChange(selectedRowKeys, selectedRows)
-      } else {
-        let mySelectedRowKeys
-        let mySelectedRows = this.selectedRows.filter(item => item.id !== selectedRowKeys[0])
-        if (this.selectedRowKeys.includes(selectedRowKeys[0])) {
-          mySelectedRowKeys = this.selectedRowKeys.filter(item => item !== selectedRowKeys[0])
-        } else {
-          mySelectedRowKeys = [...selectedRowKeys, ...this.selectedRowKeys]
-          mySelectedRows = [...mySelectedRows, ...selectedRows]
-        }
-        this.$refs.table.updateSelect(mySelectedRowKeys, mySelectedRows)
-        this.$refs.table.rowSelection.onChange(mySelectedRowKeys, mySelectedRows)
-      }
-    }
-  }
-}
-</script>

+ 0 - 36
src/views/other/IconSelectorView.vue

@@ -1,36 +0,0 @@
-<template>
-  <a-card :body-style="{padding: '24px 32px'}" :bordered="false">
-    <icon-selector v-model="currentSelectedIcon" @change="handleIconChange"/>
-
-    <a-divider />
-    <p>测试 IconSelector 组件 v-model 功能</p>
-    <a-button @click="changeIcon('down')">改变 Icon-down</a-button>
-    <a-divider type="vertical" />
-    <a-button @click="changeIcon('cloud-download')">改变 Icon-cloud-download</a-button>
-  </a-card>
-</template>
-
-<script>
-import IconSelector from '@/components/IconSelector'
-
-export default {
-  name: 'IconSelectorView',
-  components: {
-    IconSelector
-  },
-  data () {
-    return {
-      currentSelectedIcon: 'pause-circle'
-    }
-  },
-  methods: {
-    handleIconChange (icon) {
-      console.log('change Icon', icon)
-      this.$message.info(<span>选中图标 <code>{icon}</code></span>)
-    },
-    changeIcon (type) {
-      this.currentSelectedIcon = type
-    }
-  }
-}
-</script>

+ 0 - 272
src/views/other/PermissionList.vue

@@ -1,272 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="角色ID">
-              <a-input placeholder="请输入"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="状态">
-              <a-select placeholder="请选择" default-value="0">
-                <a-select-option value="0">全部</a-select-option>
-                <a-select-option value="1">关闭</a-select-option>
-                <a-select-option value="2">运行中</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary">查询</a-button>
-              <a-button style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <s-table :columns="columns" :data="loadData">
-
-      <span slot="actions" slot-scope="text, record">
-        <a-tag v-for="(action, index) in record.actionList" :key="index">{{ action.describe }}</a-tag>
-      </span>
-
-      <span slot="status" slot-scope="text">
-        {{ text | statusFilter }}
-      </span>
-
-      <span slot="action" slot-scope="text, record">
-        <a @click="handleEdit(record)">编辑</a>
-        <a-divider type="vertical" />
-        <a-dropdown>
-          <a class="ant-dropdown-link">
-            更多 <a-icon type="down" />
-          </a>
-          <a-menu slot="overlay">
-            <a-menu-item>
-              <a href="javascript:;">详情</a>
-            </a-menu-item>
-            <a-menu-item>
-              <a href="javascript:;">禁用</a>
-            </a-menu-item>
-            <a-menu-item>
-              <a href="javascript:;">删除</a>
-            </a-menu-item>
-          </a-menu>
-        </a-dropdown>
-      </span>
-    </s-table>
-
-    <a-modal
-      title="操作"
-      :width="800"
-      v-model="visible"
-      @ok="handleOk"
-    >
-      <a-form :autoFormCreate="(form)=>{this.form = form}">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="唯一识别码"
-          hasFeedback
-          validateStatus="success"
-        >
-          <a-input placeholder="唯一识别码" v-model="mdl.id" id="no" disabled="disabled" />
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="权限名称"
-          hasFeedback
-          validateStatus="success"
-        >
-          <a-input placeholder="起一个名字" v-model="mdl.name" id="permission_name" />
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="状态"
-          hasFeedback
-          validateStatus="warning"
-        >
-          <a-select v-model="mdl.status">
-            <a-select-option value="1">正常</a-select-option>
-            <a-select-option value="2">禁用</a-select-option>
-          </a-select>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="描述"
-          hasFeedback
-        >
-          <a-textarea :rows="5" v-model="mdl.describe" placeholder="..." id="describe"/>
-        </a-form-item>
-
-        <a-divider />
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="赋予权限"
-          hasFeedback
-        >
-          <a-select
-            style="width: 100%"
-            mode="multiple"
-            v-model="mdl.actions"
-            :allowClear="true"
-          >
-            <a-select-option v-for="(action, index) in permissionList" :key="index" :value="action.value">{{ action.label }}</a-select-option>
-          </a-select>
-        </a-form-item>
-
-      </a-form>
-    </a-modal>
-
-  </a-card>
-</template>
-
-<script>
-import { STable } from '@/components'
-
-export default {
-  name: 'TableList',
-  components: {
-    STable
-  },
-  data () {
-    return {
-      description: '列表使用场景:后台管理中的权限管理以及角色管理,可用于基于 RBAC 设计的角色权限控制,颗粒度细到每一个操作类型。',
-
-      visible: false,
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 }
-      },
-      form: null,
-      mdl: {},
-
-      // 高级搜索 展开/关闭
-      advanced: false,
-      // 查询参数
-      queryParam: {},
-      // 表头
-      columns: [
-        {
-          title: '唯一识别码',
-          dataIndex: 'id'
-        },
-        {
-          title: '权限名称',
-          dataIndex: 'name'
-        },
-        {
-          title: '可操作权限',
-          dataIndex: 'actions',
-          scopedSlots: { customRender: 'actions' }
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          scopedSlots: { customRender: 'status' }
-        },
-        {
-          title: '操作',
-          width: '150px',
-          dataIndex: 'action',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 向后端拉取可以用的操作列表
-      permissionList: null,
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        return this.$http.get('/permission', {
-          params: Object.assign(parameter, this.queryParam)
-        }).then(res => {
-          const result = res.result
-          result.data.map(permission => {
-            permission.actionList = JSON.parse(permission.actionData)
-            return permission
-          })
-          return result
-        })
-      },
-
-      selectedRowKeys: [],
-      selectedRows: []
-    }
-  },
-  filters: {
-    statusFilter (status) {
-      const statusMap = {
-        1: '正常',
-        2: '禁用'
-      }
-      return statusMap[status]
-    }
-  },
-  created () {
-    this.loadPermissionList()
-  },
-  methods: {
-    loadPermissionList () {
-      // permissionList
-      new Promise(resolve => {
-        const data = [
-          { label: '新增', value: 'add', defaultChecked: false },
-          { label: '查询', value: 'get', defaultChecked: false },
-          { label: '修改', value: 'update', defaultChecked: false },
-          { label: '列表', value: 'query', defaultChecked: false },
-          { label: '删除', value: 'delete', defaultChecked: false },
-          { label: '导入', value: 'import', defaultChecked: false },
-          { label: '导出', value: 'export', defaultChecked: false }
-        ]
-        setTimeout(resolve(data), 1500)
-      }).then(res => {
-        this.permissionList = res
-      })
-    },
-    handleEdit (record) {
-      this.mdl = Object.assign({}, record)
-      console.log(this.mdl)
-      this.visible = true
-    },
-    handleOk () {
-
-    },
-    onChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    toggleAdvanced () {
-      this.advanced = !this.advanced
-    }
-  },
-  watch: {
-    /*
-      'selectedRows': function (selectedRows) {
-        this.needTotalList = this.needTotalList.map(item => {
-          return {
-            ...item,
-            total: selectedRows.reduce( (sum, val) => {
-              return sum + val[item.dataIndex]
-            }, 0)
-          }
-        })
-      }
-      */
-  }
-}
-</script>

+ 0 - 182
src/views/other/RoleList.vue

@@ -1,182 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="角色ID">
-              <a-input placeholder="请输入"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="状态">
-              <a-select placeholder="请选择" default-value="0">
-                <a-select-option value="0">全部</a-select-option>
-                <a-select-option value="1">正常</a-select-option>
-                <a-select-option value="2">禁用</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary">查询</a-button>
-              <a-button style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      :columns="columns"
-      :data="loadData"
-    >
-      <div
-        slot="expandedRowRender"
-        slot-scope="record"
-        style="margin: 0">
-        <a-row
-          :gutter="24"
-          :style="{ marginBottom: '12px' }">
-          <a-col :span="12" v-for="(role, index) in record.permissions" :key="index" :style="{ marginBottom: '12px' }">
-            <a-col :span="4">
-              <span>{{ role.permissionName }}:</span>
-            </a-col>
-            <a-col :span="20" v-if="role.actionEntitySet.length > 0">
-              <a-tag color="cyan" v-for="(action, k) in role.actionEntitySet" :key="k">{{ action.describe }}</a-tag>
-            </a-col>
-            <a-col :span="20" v-else>-</a-col>
-          </a-col>
-        </a-row>
-      </div>
-      <span slot="action" slot-scope="text, record">
-        <a @click="$refs.modal.edit(record)">编辑</a>
-        <a-divider type="vertical" />
-        <a-dropdown>
-          <a class="ant-dropdown-link">
-            更多 <a-icon type="down" />
-          </a>
-          <a-menu slot="overlay">
-            <a-menu-item>
-              <a href="javascript:;">详情</a>
-            </a-menu-item>
-            <a-menu-item>
-              <a href="javascript:;">禁用</a>
-            </a-menu-item>
-            <a-menu-item>
-              <a href="javascript:;">删除</a>
-            </a-menu-item>
-          </a-menu>
-        </a-dropdown>
-      </span>
-    </s-table>
-
-    <role-modal ref="modal" @ok="handleOk"></role-modal>
-
-  </a-card>
-</template>
-
-<script>
-import { STable } from '@/components'
-import RoleModal from './modules/RoleModal'
-
-export default {
-  name: 'TableList',
-  components: {
-    STable,
-    RoleModal
-  },
-  data () {
-    return {
-      description: '列表使用场景:后台管理中的权限管理以及角色管理,可用于基于 RBAC 设计的角色权限控制,颗粒度细到每一个操作类型。',
-
-      visible: false,
-
-      form: null,
-      mdl: {},
-
-      // 高级搜索 展开/关闭
-      advanced: false,
-      // 查询参数
-      queryParam: {},
-      // 表头
-      columns: [
-        {
-          title: '唯一识别码',
-          dataIndex: 'id'
-        },
-        {
-          title: '角色名称',
-          dataIndex: 'name'
-        },
-        {
-          title: '状态',
-          dataIndex: 'status'
-        },
-        {
-          title: '创建时间',
-          dataIndex: 'createTime',
-          sorter: true
-        }, {
-          title: '操作',
-          width: '150px',
-          dataIndex: 'action',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        return this.$http.get('/role', {
-          params: Object.assign(parameter, this.queryParam)
-        }).then(res => {
-          return res.result
-        })
-      },
-
-      selectedRowKeys: [],
-      selectedRows: []
-    }
-  },
-  methods: {
-    handleEdit (record) {
-      this.mdl = Object.assign({}, record)
-
-      this.mdl.permissions.forEach(permission => {
-        permission.actionsOptions = permission.actionEntitySet.map(action => {
-          return { label: action.describe, value: action.action, defaultCheck: action.defaultCheck }
-        })
-      })
-
-      console.log(this.mdl)
-      this.visible = true
-    },
-    handleOk () {
-      // 新增/修改 成功时,重载列表
-      this.$refs.table.refresh()
-    },
-    onChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    toggleAdvanced () {
-      this.advanced = !this.advanced
-    }
-  },
-  watch: {
-    /*
-      'selectedRows': function (selectedRows) {
-        this.needTotalList = this.needTotalList.map(item => {
-          return {
-            ...item,
-            total: selectedRows.reduce( (sum, val) => {
-              return sum + val[item.dataIndex]
-            }, 0)
-          }
-        })
-      }
-      */
-  }
-}
-</script>

+ 0 - 268
src/views/other/TableInnerEditList.vue

@@ -1,268 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="规则编号">
-              <a-input placeholder=""/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="使用状态">
-              <a-select placeholder="请选择" default-value="0">
-                <a-select-option value="0">全部</a-select-option>
-                <a-select-option value="1">关闭</a-select-option>
-                <a-select-option value="2">运行中</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <template v-if="advanced">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="调用次数">
-                <a-input-number style="width: 100%"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="更新日期">
-                <a-date-picker style="width: 100%" placeholder="请输入更新日期"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="使用状态">
-                <a-select placeholder="请选择" default-value="0">
-                  <a-select-option value="0">全部</a-select-option>
-                  <a-select-option value="1">关闭</a-select-option>
-                  <a-select-option value="2">运行中</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="使用状态">
-                <a-select placeholder="请选择" default-value="0">
-                  <a-select-option value="0">全部</a-select-option>
-                  <a-select-option value="1">关闭</a-select-option>
-                  <a-select-option value="2">运行中</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :md="!advanced && 8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
-              <a-button type="primary">查询</a-button>
-              <a-button style="margin-left: 8px">重置</a-button>
-              <a @click="toggleAdvanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator">
-      <a-button type="primary" icon="plus">新建</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1"><a-icon type="delete" />删除</a-menu-item>
-          <!-- lock | unlock -->
-          <a-menu-item key="2"><a-icon type="lock" />锁定</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      :columns="columns"
-      :data="loadData"
-      :alert="{ show: true, clear: true }"
-      :rowSelection="{ selectedRowKeys: this.selectedRowKeys, onChange: this.onSelectChange }"
-    >
-      <template v-for="(col, index) in columns" v-if="col.scopedSlots" :slot="col.dataIndex" slot-scope="text, record">
-        <div :key="index">
-          <a-input
-            v-if="record.editable"
-            style="margin: -5px 0"
-            :value="text"
-            @change="e => handleChange(e.target.value, record.key, col, record)"
-          />
-          <template v-else>{{ text }}</template>
-        </div>
-      </template>
-      <template slot="action" slot-scope="text, record">
-        <div class="editable-row-operations">
-          <span v-if="record.editable">
-            <a @click="() => save(record)">保存</a>
-            <a-divider type="vertical" />
-            <a-popconfirm title="真的放弃编辑吗?" @confirm="() => cancel(record)">
-              <a>取消</a>
-            </a-popconfirm>
-          </span>
-          <span v-else>
-            <a class="edit" @click="() => edit(record)">修改</a>
-            <a-divider type="vertical" />
-            <a class="delete" @click="() => del(record)">删除</a>
-          </span>
-        </div>
-      </template>
-    </s-table>
-
-  </a-card>
-</template>
-
-<script>
-import { STable } from '@/components'
-
-export default {
-  name: 'TableList',
-  components: {
-    STable
-  },
-  data () {
-    return {
-      // 高级搜索 展开/关闭
-      advanced: false,
-      // 查询参数
-      queryParam: {},
-      // 表头
-      columns: [
-        {
-          title: '规则编号',
-          dataIndex: 'no',
-          width: 90
-        },
-        {
-          title: '描述',
-          dataIndex: 'description',
-          scopedSlots: { customRender: 'description' }
-        },
-        {
-          title: '服务调用次数',
-          dataIndex: 'callNo',
-          width: '150px',
-          sorter: true,
-          needTotal: true,
-          scopedSlots: { customRender: 'callNo' }
-          // customRender: (text) => text + ' 次'
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          width: '100px',
-          needTotal: true,
-          scopedSlots: { customRender: 'status' }
-        },
-        {
-          title: '更新时间',
-          dataIndex: 'updatedAt',
-          width: '200px',
-          sorter: true,
-          scopedSlots: { customRender: 'updatedAt' }
-        },
-        {
-          table: '操作',
-          dataIndex: 'action',
-          width: '120px',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        return this.$http.get('/service', {
-          params: Object.assign(parameter, this.queryParam)
-        }).then(res => {
-          return res.result
-        })
-      },
-
-      selectedRowKeys: [],
-      selectedRows: []
-    }
-  },
-  methods: {
-
-    handleChange (value, key, column, record) {
-      console.log(value, key, column)
-      record[column.dataIndex] = value
-    },
-    edit (row) {
-      row.editable = true
-      // row = Object.assign({}, row)
-    },
-    // eslint-disable-next-line
-    del (row) {
-      this.$confirm({
-        title: '警告',
-        content: `真的要删除 ${row.no} 吗?`,
-        okText: '删除',
-        okType: 'danger',
-        cancelText: '取消',
-        onOk () {
-          console.log('OK')
-          // 在这里调用删除接口
-          return new Promise((resolve, reject) => {
-            setTimeout(Math.random() > 0.5 ? resolve : reject, 1000)
-          }).catch(() => console.log('Oops errors!'))
-        },
-        onCancel () {
-          console.log('Cancel')
-        }
-      })
-    },
-    save (row) {
-      row.editable = false
-    },
-    cancel (row) {
-      row.editable = false
-    },
-
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    toggleAdvanced () {
-      this.advanced = !this.advanced
-    }
-  },
-  watch: {
-    /*
-      'selectedRows': function (selectedRows) {
-        this.needTotalList = this.needTotalList.map(item => {
-          return {
-            ...item,
-            total: selectedRows.reduce( (sum, val) => {
-              return sum + val[item.dataIndex]
-            }, 0)
-          }
-        })
-      }
-      */
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .search {
-    margin-bottom: 54px;
-  }
-
-  .fold {
-    width: calc(100% - 216px);
-    display: inline-block
-  }
-
-  .operator {
-    margin-bottom: 18px;
-  }
-
-  @media screen and (max-width: 900px) {
-    .fold {
-      width: 100%;
-    }
-  }
-</style>

+ 0 - 192
src/views/other/TreeList.vue

@@ -1,192 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <a-row :gutter="8">
-      <a-col :span="5">
-        <s-tree
-          :dataSource="orgTree"
-          :openKeys.sync="openKeys"
-          :search="true"
-          @click="handleClick"
-          @add="handleAdd"
-          @titleClick="handleTitleClick"></s-tree>
-      </a-col>
-      <a-col :span="19">
-        <s-table
-          ref="table"
-          size="default"
-          :columns="columns"
-          :data="loadData"
-          :alert="false"
-          :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        >
-          <span slot="action" slot-scope="text, record">
-            <template v-if="$auth('table.update')">
-              <a @click="handleEdit(record)">编辑</a>
-              <a-divider type="vertical" />
-            </template>
-            <a-dropdown>
-              <a class="ant-dropdown-link">
-                更多 <a-icon type="down" />
-              </a>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a href="javascript:;">详情</a>
-                </a-menu-item>
-                <a-menu-item v-if="$auth('table.disable')">
-                  <a href="javascript:;">禁用</a>
-                </a-menu-item>
-                <a-menu-item v-if="$auth('table.delete')">
-                  <a href="javascript:;">删除</a>
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
-          </span>
-        </s-table>
-      </a-col>
-    </a-row>
-
-    <org-modal ref="modal" @ok="handleSaveOk" @close="handleSaveClose" />
-  </a-card>
-</template>
-
-<script>
-import STree from '@/components/Tree/Tree'
-import { STable } from '@/components'
-import OrgModal from './modules/OrgModal'
-import { getOrgTree, getServiceList } from '@/api/upms/manage'
-
-export default {
-  name: 'TreeList',
-  components: {
-    STable,
-    STree,
-    OrgModal
-  },
-  data () {
-    return {
-      openKeys: ['key-01'],
-
-      // 查询参数
-      queryParam: {},
-      // 表头
-      columns: [
-        {
-          title: '#',
-          dataIndex: 'no'
-        },
-        {
-          title: '成员名称',
-          dataIndex: 'description'
-        },
-        {
-          title: '登录次数',
-          dataIndex: 'callNo',
-          sorter: true,
-          needTotal: true,
-          customRender: (text) => text + ' 次'
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          needTotal: true
-        },
-        {
-          title: '更新时间',
-          dataIndex: 'updatedAt',
-          sorter: true
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          width: '150px',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        return getServiceList(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.result
-          })
-      },
-      orgTree: [],
-      selectedRowKeys: [],
-      selectedRows: []
-    }
-  },
-  created () {
-    getOrgTree().then(res => {
-      this.orgTree = res.result
-    })
-  },
-  methods: {
-    handleClick (e) {
-      console.log('handleClick', e)
-      this.queryParam = {
-        key: e.key
-      }
-      this.$refs.table.refresh(true)
-    },
-    handleAdd (item) {
-      console.log('add button, item', item)
-      this.$message.info(`提示:你点了 ${item.key} - ${item.title} `)
-      this.$refs.modal.add(item.key)
-    },
-    handleTitleClick (item) {
-      console.log('handleTitleClick', item)
-    },
-    titleClick (e) {
-      console.log('titleClick', e)
-    },
-    handleSaveOk () {
-
-    },
-    handleSaveClose () {
-
-    },
-
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .custom-tree {
-
-    /deep/ .ant-menu-item-group-title {
-      position: relative;
-      &:hover {
-        .btn {
-          display: block;
-        }
-      }
-    }
-
-    /deep/ .ant-menu-item {
-      &:hover {
-        .btn {
-          display: block;
-        }
-      }
-    }
-
-    /deep/ .btn {
-      display: none;
-      position: absolute;
-      top: 0;
-      right: 10px;
-      width: 20px;
-      height: 40px;
-      line-height: 40px;
-      z-index: 1050;
-
-      &:hover {
-        transform: scale(1.2);
-        transition: 0.5s all;
-      }
-    }
-  }
-</style>

+ 0 - 265
src/views/other/UserList.vue

@@ -1,265 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="角色ID">
-              <a-input placeholder="请输入"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="状态">
-              <a-select placeholder="请选择" default-value="0">
-                <a-select-option value="0">全部</a-select-option>
-                <a-select-option value="1">关闭</a-select-option>
-                <a-select-option value="2">运行中</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary">查询</a-button>
-              <a-button style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <s-table
-      size="default"
-      :columns="columns"
-      :data="loadData"
-    >
-      <div
-        slot="expandedRowRender"
-        slot-scope="record"
-        style="margin: 0">
-        <a-row
-          :gutter="24"
-          :style="{ marginBottom: '12px' }">
-          <a-col :span="12" v-for="(role, index) in record.permissions" :key="index" :style="{ marginBottom: '12px' }">
-            <a-col :lg="4" :md="24">
-              <span>{{ role.permissionName }}:</span>
-            </a-col>
-            <a-col :lg="20" :md="24" v-if="role.actionEntitySet.length > 0">
-              <a-tag color="cyan" v-for="(action, k) in role.actionEntitySet" :key="k">{{ action.describe }}</a-tag>
-            </a-col>
-            <a-col :span="20" v-else>-</a-col>
-          </a-col>
-        </a-row>
-      </div>
-      <span slot="action" slot-scope="text, record">
-        <a @click="handleEdit(record)">编辑</a>
-        <a-divider type="vertical" />
-        <a-dropdown>
-          <a class="ant-dropdown-link">
-            更多 <a-icon type="down" />
-          </a>
-          <a-menu slot="overlay">
-            <a-menu-item>
-              <a href="javascript:;">详情</a>
-            </a-menu-item>
-            <a-menu-item>
-              <a href="javascript:;">禁用</a>
-            </a-menu-item>
-            <a-menu-item>
-              <a href="javascript:;">删除</a>
-            </a-menu-item>
-          </a-menu>
-        </a-dropdown>
-      </span>
-    </s-table>
-
-    <a-modal
-      title="操作"
-      style="top: 20px;"
-      :width="800"
-      v-model="visible"
-      @ok="handleOk"
-    >
-      <a-form :autoFormCreate="(form)=>{this.form = form}">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="唯一识别码"
-          hasFeedback
-          validateStatus="success"
-        >
-          <a-input placeholder="唯一识别码" v-model="mdl.id" id="no" disabled="disabled" />
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="角色名称"
-          hasFeedback
-          validateStatus="success"
-        >
-          <a-input placeholder="起一个名字" v-model="mdl.name" id="role_name" />
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="状态"
-          hasFeedback
-          validateStatus="warning"
-        >
-          <a-select v-model="mdl.status">
-            <a-select-option value="1">正常</a-select-option>
-            <a-select-option value="2">禁用</a-select-option>
-          </a-select>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="描述"
-          hasFeedback
-        >
-          <a-textarea :rows="5" v-model="mdl.describe" placeholder="..." id="describe"/>
-        </a-form-item>
-
-        <a-divider />
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="拥有权限"
-          hasFeedback
-        >
-          <a-row :gutter="16" v-for="(permission, index) in mdl.permissions" :key="index">
-            <a-col :span="4">
-              {{ permission.permissionName }}:
-            </a-col>
-            <a-col :span="20">
-              <a-checkbox-group :options="permission.actionsOptions"/>
-            </a-col>
-          </a-row>
-
-        </a-form-item>
-
-      </a-form>
-    </a-modal>
-
-  </a-card>
-</template>
-
-<script>
-import { STable } from '@/components'
-import { getRoleList, getServiceList } from '@/api/upms/manage'
-
-export default {
-  name: 'TableList',
-  components: {
-    STable
-  },
-  data () {
-    return {
-      description: '列表使用场景:后台管理中的权限管理以及角色管理,可用于基于 RBAC 设计的角色权限控制,颗粒度细到每一个操作类型。',
-
-      visible: false,
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 }
-      },
-      form: null,
-      mdl: {},
-
-      // 高级搜索 展开/关闭
-      advanced: false,
-      // 查询参数
-      queryParam: {},
-      // 表头
-      columns: [
-        {
-          title: '唯一识别码',
-          dataIndex: 'id'
-        },
-        {
-          title: '角色名称',
-          dataIndex: 'name'
-        },
-        {
-          title: '状态',
-          dataIndex: 'status'
-        },
-        {
-          title: '创建时间',
-          dataIndex: 'createTime',
-          sorter: true
-        }, {
-          title: '操作',
-          width: '150px',
-          dataIndex: 'action',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        return getRoleList(parameter)
-          .then(res => {
-            console.log('getRoleList', res)
-            return res.result
-          })
-      },
-
-      selectedRowKeys: [],
-      selectedRows: []
-    }
-  },
-  created () {
-    getServiceList().then(res => {
-      console.log('getServiceList.call()', res)
-    })
-
-    getRoleList().then(res => {
-      console.log('getRoleList.call()', res)
-    })
-  },
-  methods: {
-    handleEdit (record) {
-      this.mdl = Object.assign({}, record)
-
-      this.mdl.permissions.forEach(permission => {
-        permission.actionsOptions = permission.actionEntitySet.map(action => {
-          return { label: action.describe, value: action.action, defaultCheck: action.defaultCheck }
-        })
-      })
-
-      this.visible = true
-    },
-    handleOk () {
-
-    },
-    onChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    toggleAdvanced () {
-      this.advanced = !this.advanced
-    }
-  },
-  watch: {
-    /*
-      'selectedRows': function (selectedRows) {
-        this.needTotalList = this.needTotalList.map(item => {
-          return {
-            ...item,
-            total: selectedRows.reduce( (sum, val) => {
-              return sum + val[item.dataIndex]
-            }, 0)
-          }
-        })
-      }
-      */
-  }
-}
-</script>

+ 0 - 100
src/views/other/modules/OrgModal.vue

@@ -1,100 +0,0 @@
-<template>
-  <a-modal
-    title="操作"
-    :width="600"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          label="父级ID"
-        >
-          <a-input v-decorator="['parentId', {}]" disabled />
-        </a-form-item>
-
-        <a-form-item
-          label="机构名称"
-        >
-          <a-input v-decorator="['orgName', {}]" />
-        </a-form-item>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-export default {
-  name: 'OrgModal',
-  data () {
-    return {
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 }
-      },
-      visible: false,
-      confirmLoading: false,
-      mdl: {}
-    }
-  },
-  beforeCreate () {
-    this.form = this.$form.createForm(this)
-    console.log('form::', this.form)
-  },
-  created () {
-
-  },
-  methods: {
-    add (id) {
-      this.edit({ parentId: id })
-    },
-    edit (record) {
-      this.mdl = Object.assign({}, record)
-      this.visible = true
-      this.$nextTick(() => {
-        this.form.setFieldsValue({ ...record })
-      })
-    },
-    close () {
-      this.$emit('close')
-      this.visible = false
-    },
-    handleOk () {
-      const _this = this
-      // 触发表单验证
-      this.form.validateFields((err, values) => {
-        // 验证表单没错误
-        if (!err) {
-          console.log('form values', values)
-
-          _this.confirmLoading = true
-          // 模拟后端请求 2000 毫秒延迟
-          new Promise((resolve) => {
-            setTimeout(() => resolve(), 2000)
-          }).then(() => {
-            // Do something
-            _this.$message.success('保存成功')
-            _this.$emit('ok')
-          }).catch(() => {
-            // Do something
-          }).finally(() => {
-            _this.confirmLoading = false
-            _this.close()
-          })
-        }
-      })
-    },
-    handleCancel () {
-      this.close()
-    }
-
-  }
-}
-</script>

+ 0 - 147
src/views/other/modules/RoleModal.vue

@@ -1,147 +0,0 @@
-<template>
-  <a-modal
-    title="操作"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-  >
-    <a-steps :current="1">
-      <a-step>
-        <!-- <span slot="title">Finished</span> -->
-        <template slot="title">
-          Finished
-        </template>
-        <span slot="description">This is a description.</span>
-      </a-step>
-      <a-step title="In Progress" description="This is a description." />
-      <a-step title="Waiting" description="This is a description." />
-    </a-steps>
-  </a-modal>
-</template>
-
-<script>
-import { getPermissions } from '@/api/upms/manage'
-import { actionToObject } from '@/utils/permissions'
-import pick from 'lodash.pick'
-
-export default {
-  name: 'RoleModal',
-  data () {
-    return {
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 }
-      },
-      visible: false,
-      confirmLoading: false,
-      mdl: {},
-
-      form: this.$form.createForm(this),
-      permissions: []
-    }
-  },
-  created () {
-    this.loadPermissions()
-  },
-  methods: {
-    add () {
-      this.edit({ id: 0 })
-    },
-    edit (record) {
-      this.mdl = Object.assign({}, record)
-      this.visible = true
-
-      // 有权限表,处理勾选
-      if (this.mdl.permissions && this.permissions) {
-        // 先处理要勾选的权限结构
-        const permissionsAction = {}
-        this.mdl.permissions.forEach(permission => {
-          permissionsAction[permission.permissionId] = permission.actionEntitySet.map(entity => entity.action)
-        })
-        // 把权限表遍历一遍,设定要勾选的权限 action
-        this.permissions.forEach(permission => {
-          permission.selected = permissionsAction[permission.id] || []
-        })
-      }
-
-      this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'status', 'describe'))
-      })
-      console.log('this.mdl', this.mdl)
-    },
-    close () {
-      this.$emit('close')
-      this.visible = false
-    },
-    handleOk () {
-      const _this = this
-      // 触发表单验证
-      this.form.validateFields((err, values) => {
-        // 验证表单没错误
-        if (!err) {
-          console.log('form values', values)
-
-          _this.confirmLoading = true
-          // 模拟后端请求 2000 毫秒延迟
-          new Promise((resolve) => {
-            setTimeout(() => resolve(), 2000)
-          }).then(() => {
-            // Do something
-            _this.$message.success('保存成功')
-            _this.$emit('ok')
-          }).catch(() => {
-            // Do something
-          }).finally(() => {
-            _this.confirmLoading = false
-            _this.close()
-          })
-        }
-      })
-    },
-    handleCancel () {
-      this.close()
-    },
-    onChangeCheck (permission) {
-      permission.indeterminate = !!permission.selected.length && (permission.selected.length < permission.actionsOptions.length)
-      permission.checkedAll = permission.selected.length === permission.actionsOptions.length
-    },
-    onChangeCheckAll (e, permission) {
-      Object.assign(permission, {
-        selected: e.target.checked ? permission.actionsOptions.map(obj => obj.value) : [],
-        indeterminate: false,
-        checkedAll: e.target.checked
-      })
-    },
-    loadPermissions () {
-      const that = this
-      getPermissions().then(res => {
-        const result = res.result
-        that.permissions = result.map(permission => {
-          const options = actionToObject(permission.actionData)
-          permission.checkedAll = false
-          permission.selected = []
-          permission.indeterminate = false
-          permission.actionsOptions = options.map(option => {
-            return {
-              label: option.describe,
-              value: option.action
-            }
-          })
-          return permission
-        })
-      })
-    }
-
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 343
src/views/profile/advanced/Advanced.vue

@@ -1,343 +0,0 @@
-
-<template>
-  <page-view title="单号:234231029431" logo="https://gw.alipayobjects.com/zos/rmsportal/nxkuOJlFJuAUhzlMTCEe.png">
-
-    <detail-list slot="headerContent" size="small" :col="2" class="detail-layout">
-      <detail-list-item term="创建人">曲丽丽</detail-list-item>
-      <detail-list-item term="订购产品">XX服务</detail-list-item>
-      <detail-list-item term="创建时间">2018-08-07</detail-list-item>
-      <detail-list-item term="关联单据"><a>12421</a></detail-list-item>
-      <detail-list-item term="生效日期">2018-08-07 ~ 2018-12-11</detail-list-item>
-      <detail-list-item term="备注">请于两个工作日内确认</detail-list-item>
-    </detail-list>
-    <a-row slot="extra" class="status-list">
-      <a-col :xs="12" :sm="12">
-        <div class="text">状态</div>
-        <div class="heading">待审批</div>
-      </a-col>
-      <a-col :xs="12" :sm="12">
-        <div class="text">订单金额</div>
-        <div class="heading">¥ 568.08</div>
-      </a-col>
-    </a-row>
-    <!-- actions -->
-    <template slot="action">
-      <a-button-group style="margin-right: 4px;">
-        <a-button>操作</a-button>
-        <a-button>操作</a-button>
-        <a-button><a-icon type="ellipsis"/></a-button>
-      </a-button-group>
-      <a-button type="primary" >主操作</a-button>
-    </template>
-
-    <a-card :bordered="false" title="流程进度">
-      <a-steps :direction="isMobile() && 'vertical' || 'horizontal'" :current="1" progressDot>
-        <a-step title="创建项目">
-        </a-step>
-        <a-step title="部门初审">
-        </a-step>
-        <a-step title="财务复核">
-        </a-step>
-        <a-step title="完成">
-        </a-step>
-      </a-steps>
-    </a-card>
-
-    <a-card style="margin-top: 24px" :bordered="false" title="用户信息">
-      <detail-list>
-        <detail-list-item term="用户姓名">付晓晓</detail-list-item>
-        <detail-list-item term="会员卡号">32943898021309809423</detail-list-item>
-        <detail-list-item term="身份证">3321944288191034921</detail-list-item>
-        <detail-list-item term="联系方式">18112345678</detail-list-item>
-        <detail-list-item term="联系地址">浙江省杭州市西湖区黄姑山路工专路交叉路口</detail-list-item>
-      </detail-list>
-      <detail-list title="信息组">
-        <detail-list-item term="某某数据">725</detail-list-item>
-        <detail-list-item term="该数据更新时间">2018-08-08</detail-list-item>
-        <detail-list-item ></detail-list-item>
-        <detail-list-item term="某某数据">725</detail-list-item>
-        <detail-list-item term="该数据更新时间">2018-08-08</detail-list-item>
-        <detail-list-item ></detail-list-item>
-      </detail-list>
-      <a-card type="inner" title="多层信息组">
-        <detail-list title="组名称" size="small">
-          <detail-list-item term="负责人">林东东</detail-list-item>
-          <detail-list-item term="角色码">1234567</detail-list-item>
-          <detail-list-item term="所属部门">XX公司-YY部</detail-list-item>
-          <detail-list-item term="过期时间">2018-08-08</detail-list-item>
-          <detail-list-item term="描述">这段描述很长很长很长很长很长很长很长很长很长很长很长很长很长很长...</detail-list-item>
-        </detail-list>
-        <a-divider style="margin: 16px 0" />
-        <detail-list title="组名称" size="small" :col="1">
-          <detail-list-item term="学名">	Citrullus lanatus (Thunb.) Matsum. et Nakai一年生蔓生藤本;茎、枝粗壮,具明显的棱。卷须较粗..</detail-list-item>
-        </detail-list>
-        <a-divider style="margin: 16px 0" />
-        <detail-list title="组名称" size="small" :col="2">
-          <detail-list-item term="负责人">付小小</detail-list-item>
-          <detail-list-item term="角色码">1234567</detail-list-item>
-        </detail-list>
-      </a-card>
-
-    </a-card>
-
-    <a-card style="margin-top: 24px" :bordered="false" title="用户近半年来电记录">
-      <div class="no-data"><a-icon type="frown-o"/>暂无数据</div>
-    </a-card>
-
-    <!-- 操作 -->
-    <a-card
-      style="margin-top: 24px"
-      :bordered="false"
-      :tabList="tabList"
-      :activeTabKey="activeTabKey"
-      @tabChange="(key) => {this.activeTabKey = key}"
-    >
-      <a-table
-        v-if="activeTabKey === '1'"
-        :columns="operationColumns"
-        :dataSource="operation1"
-        :pagination="false"
-      >
-        <template
-          slot="status"
-          slot-scope="status">
-          <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
-        </template>
-      </a-table>
-      <a-table
-        v-if="activeTabKey === '2'"
-        :columns="operationColumns"
-        :dataSource="operation2"
-        :pagination="false"
-      >
-        <template
-          slot="status"
-          slot-scope="status">
-          <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
-        </template>
-      </a-table>
-      <a-table
-        v-if="activeTabKey === '3'"
-        :columns="operationColumns"
-        :dataSource="operation3"
-        :pagination="false"
-      >
-        <template
-          slot="status"
-          slot-scope="status">
-          <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
-        </template>
-      </a-table>
-    </a-card>
-
-  </page-view>
-</template>
-
-<script>
-import { mixinDevice } from '@/utils/mixin'
-import { PageView } from '@/layouts'
-import DetailList from '@/components/tools/DetailList'
-
-const DetailListItem = DetailList.Item
-
-export default {
-  name: 'Advanced',
-  components: {
-    PageView,
-    DetailList,
-    DetailListItem
-  },
-  mixins: [mixinDevice],
-  data () {
-    return {
-      tabList: [
-        {
-          key: '1',
-          tab: '操作日志一'
-        },
-        {
-          key: '2',
-          tab: '操作日志二'
-        },
-        {
-          key: '3',
-          tab: '操作日志三'
-        }
-      ],
-      activeTabKey: '1',
-
-      operationColumns: [
-        {
-          title: '操作类型',
-          dataIndex: 'type',
-          key: 'type'
-        },
-        {
-          title: '操作人',
-          dataIndex: 'name',
-          key: 'name'
-        },
-        {
-          title: '执行结果',
-          dataIndex: 'status',
-          key: 'status',
-          scopedSlots: { customRender: 'status' }
-        },
-        {
-          title: '操作时间',
-          dataIndex: 'updatedAt',
-          key: 'updatedAt'
-        },
-        {
-          title: '备注',
-          dataIndex: 'remark',
-          key: 'remark'
-        }
-      ],
-      operation1: [
-        {
-          key: 'op1',
-          type: '订购关系生效',
-          name: '曲丽丽',
-          status: 'agree',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '-'
-        },
-        {
-          key: 'op2',
-          type: '财务复审',
-          name: '付小小',
-          status: 'reject',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '不通过原因'
-        },
-        {
-          key: 'op3',
-          type: '部门初审',
-          name: '周毛毛',
-          status: 'agree',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '-'
-        },
-        {
-          key: 'op4',
-          type: '提交订单',
-          name: '林东东',
-          status: 'agree',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '很棒'
-        },
-        {
-          key: 'op5',
-          type: '创建订单',
-          name: '汗牙牙',
-          status: 'agree',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '-'
-        }
-      ],
-      operation2: [
-        {
-          key: 'op2',
-          type: '财务复审',
-          name: '付小小',
-          status: 'reject',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '不通过原因'
-        },
-        {
-          key: 'op3',
-          type: '部门初审',
-          name: '周毛毛',
-          status: 'agree',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '-'
-        },
-        {
-          key: 'op4',
-          type: '提交订单',
-          name: '林东东',
-          status: 'agree',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '很棒'
-        }
-      ],
-      operation3: [
-        {
-          key: 'op2',
-          type: '财务复审',
-          name: '付小小',
-          status: 'reject',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '不通过原因'
-        },
-        {
-          key: 'op3',
-          type: '部门初审',
-          name: '周毛毛',
-          status: 'agree',
-          updatedAt: '2017-10-03  19:23:12',
-          remark: '-'
-        }
-      ]
-    }
-  },
-  filters: {
-    statusFilter (status) {
-      const statusMap = {
-        'agree': '成功',
-        'reject': '驳回'
-      }
-      return statusMap[status]
-    },
-    statusTypeFilter (type) {
-      const statusTypeMap = {
-        'agree': 'success',
-        'reject': 'error'
-      }
-      return statusTypeMap[type]
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-
-  .detail-layout {
-    margin-left: 44px;
-  }
-  .text {
-    color: rgba(0, 0, 0, .45);
-  }
-
-  .heading {
-    color: rgba(0, 0, 0, .85);
-    font-size: 20px;
-  }
-
-  .no-data {
-    color: rgba(0, 0, 0, .25);
-    text-align: center;
-    line-height: 64px;
-    font-size: 16px;
-
-    i {
-      font-size: 24px;
-      margin-right: 16px;
-      position: relative;
-      top: 3px;
-    }
-  }
-
-  .mobile {
-    .detail-layout {
-      margin-left: unset;
-    }
-    .text {
-
-    }
-    .status-list {
-      text-align: left;
-    }
-  }
-</style>

+ 0 - 255
src/views/profile/basic/Index.vue

@@ -1,255 +0,0 @@
-<template>
-  <page-view :title="title">
-    <a-card :bordered="false">
-      <detail-list title="退款申请">
-        <detail-list-item term="取货单号">1000000000</detail-list-item>
-        <detail-list-item term="状态">已取货</detail-list-item>
-        <detail-list-item term="销售单号">1234123421</detail-list-item>
-        <detail-list-item term="子订单">3214321432</detail-list-item>
-      </detail-list>
-      <a-divider style="margin-bottom: 32px"/>
-      <detail-list title="用户信息">
-        <detail-list-item term="用户姓名">付小小</detail-list-item>
-        <detail-list-item term="联系电话">18100000000</detail-list-item>
-        <detail-list-item term="常用快递">菜鸟仓储</detail-list-item>
-        <detail-list-item term="取货地址">浙江省杭州市西湖区万塘路18号</detail-list-item>
-        <detail-list-item term="备注">	无</detail-list-item>
-      </detail-list>
-      <a-divider style="margin-bottom: 32px"/>
-
-      <div class="title">退货商品</div>
-      <s-table
-        style="margin-bottom: 24px"
-        row-key="id"
-        :columns="goodsColumns"
-        :data="loadGoodsData">
-
-      </s-table>
-
-      <div class="title">退货进度</div>
-      <s-table
-        style="margin-bottom: 24px"
-        row-key="key"
-        :columns="scheduleColumns"
-        :data="loadScheduleData">
-
-        <template
-          slot="status"
-          slot-scope="status">
-          <a-badge :status="status" :text="status | statusFilter"/>
-        </template>
-
-      </s-table>
-    </a-card>
-  </page-view>
-</template>
-
-<script>
-import { PageView } from '@/layouts'
-import { STable } from '@/components'
-import DetailList from '@/components/tools/DetailList'
-const DetailListItem = DetailList.Item
-
-export default {
-  components: {
-    PageView,
-    DetailList,
-    DetailListItem,
-    STable
-  },
-  data () {
-    return {
-      goodsColumns: [
-        {
-          title: '商品编号',
-          dataIndex: 'id',
-          key: 'id'
-        },
-        {
-          title: '商品名称',
-          dataIndex: 'name',
-          key: 'name'
-        },
-        {
-          title: '商品条码',
-          dataIndex: 'barcode',
-          key: 'barcode'
-        },
-        {
-          title: '单价',
-          dataIndex: 'price',
-          key: 'price',
-          align: 'right'
-        },
-        {
-          title: '数量(件)',
-          dataIndex: 'num',
-          key: 'num',
-          align: 'right'
-        },
-        {
-          title: '金额',
-          dataIndex: 'amount',
-          key: 'amount',
-          align: 'right'
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadGoodsData: () => {
-        return new Promise(resolve => {
-          resolve({
-            data: [
-              {
-                id: '1234561',
-                name: '矿泉水 550ml',
-                barcode: '12421432143214321',
-                price: '2.00',
-                num: '1',
-                amount: '2.00'
-              },
-              {
-                id: '1234562',
-                name: '凉茶 300ml',
-                barcode: '12421432143214322',
-                price: '3.00',
-                num: '2',
-                amount: '6.00'
-              },
-              {
-                id: '1234563',
-                name: '好吃的薯片',
-                barcode: '12421432143214323',
-                price: '7.00',
-                num: '4',
-                amount: '28.00'
-              },
-              {
-                id: '1234564',
-                name: '特别好吃的蛋卷',
-                barcode: '12421432143214324',
-                price: '8.50',
-                num: '3',
-                amount: '25.50'
-              }
-            ],
-            pageSize: 10,
-            pageNo: 1,
-            totalPage: 1,
-            totalCount: 10
-          })
-        }).then(res => {
-          return res
-        })
-      },
-
-      scheduleColumns: [
-        {
-          title: '时间',
-          dataIndex: 'time',
-          key: 'time'
-        },
-        {
-          title: '当前进度',
-          dataIndex: 'rate',
-          key: 'rate'
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          key: 'status',
-          scopedSlots: { customRender: 'status' }
-        },
-        {
-          title: '操作员ID',
-          dataIndex: 'operator',
-          key: 'operator'
-        },
-        {
-          title: '耗时',
-          dataIndex: 'cost',
-          key: 'cost'
-        }
-      ],
-      loadScheduleData: () => {
-        return new Promise(resolve => {
-          resolve({
-            data: [
-              {
-                key: '1',
-                time: '2017-10-01 14:10',
-                rate: '联系客户',
-                status: 'processing',
-                operator: '取货员 ID1234',
-                cost: '5mins'
-              },
-              {
-                key: '2',
-                time: '2017-10-01 14:05',
-                rate: '取货员出发',
-                status: 'success',
-                operator: '取货员 ID1234',
-                cost: '1h'
-              },
-              {
-                key: '3',
-                time: '2017-10-01 13:05',
-                rate: '取货员接单',
-                status: 'success',
-                operator: '取货员 ID1234',
-                cost: '5mins'
-              },
-              {
-                key: '4',
-                time: '2017-10-01 13:00',
-                rate: '申请审批通过',
-                status: 'success',
-                operator: '系统',
-                cost: '1h'
-              },
-              {
-                key: '5',
-                time: '2017-10-01 12:00',
-                rate: '发起退货申请',
-                status: 'success',
-                operator: '用户',
-                cost: '5mins'
-              }
-            ],
-            pageSize: 10,
-            pageNo: 1,
-            totalPage: 1,
-            totalCount: 10
-          })
-        }).then(res => {
-          return res
-        })
-      }
-    }
-  },
-  filters: {
-    statusFilter (status) {
-      const statusMap = {
-        'processing': '进行中',
-        'success': '完成',
-        'failed': '失败'
-      }
-      return statusMap[status]
-    }
-  },
-  computed: {
-    title () {
-      return this.$route.meta.title
-    }
-  }
-
-}
-</script>
-
-<style lang="less" scoped>
-  .title {
-    color: rgba(0,0,0,.85);
-    font-size: 16px;
-    font-weight: 500;
-    margin-bottom: 16px;
-  }
-</style>

+ 4 - 1
src/views/sb/info/SbInfo.vue

@@ -213,7 +213,7 @@
         </div>
       </a-col>
     </a-row>
-    <base-form ref="baseModal" @ok="handleOk"/>
+    <base-form ref="baseModal" :parent-id="queryParam.parentId" :parent-name="queryParam.parentName" @ok="handleOk"/>
     <base-form-status-log ref="baseModalStatusLog" @ok="handleOk"/>
     <detail ref="detailModal" @ok="handleOk"/>
     <download-modal ref="downloadModal"/>
@@ -531,6 +531,9 @@ export default {
     }
   },
   created () {
+    console.log('this.$route.query.parentId: ' + this.$route.query.parentId)
+    this.queryParam.parentId = this.$route.query.parentId
+    this.queryParam.parentName = this.$route.query.parentName
     this.tableOption()
     this.depreciationTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_DEPRECIATIONTYPE)
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)

+ 20 - 1
src/views/sb/info/modules/BaseForm.vue

@@ -191,7 +191,7 @@
       </a-row>
 
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-<!--        <a-col :lg="12" :md="24" :sm="24">
+        <!--        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="使用位置"
             :labelCol="BaseTool.Constant.labelCol"
@@ -1002,6 +1002,14 @@ export default {
     useType: {
       type: Number,
       default: 3
+    },
+    parentId: {
+      type: String,
+      default: null
+    },
+    parentName: {
+      type: String,
+      default: null
     }
   },
   created () {
@@ -1022,6 +1030,17 @@ export default {
   },
   methods: {
     base (record, type) {
+      if (this.parentId) {
+        const { form: { setFieldsValue } } = this
+        // 日期处理
+        this.$nextTick(() => {
+          setFieldsValue(Object.assign({
+            'parentId': this.parentId,
+            'parentSbName': this.parentName,
+            'isChild': this.BaseTool.Object.getField(this.isChildMap, this.DictCache.VALUE.SB_IS_CHILD.IS_CHILD)
+          }))
+        })
+      }
       this.setTree(record)
       // 清除文件列表
       this.visible = true

+ 8 - 4
src/views/sb/info/modules/Detail.vue

@@ -187,7 +187,6 @@ import { queryNumPartInfo } from '@/api/part/info'
 import { queryNumModelbom } from '@/api/sb/modelbom'
 import { queryChildNumSbInfo } from '@/api/sb/info'
 import SparePartUsedSelectTable from '@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable'
-import SbOilPageTable from '@/views/sb/oil/modules/SbOilPageTable'
 import SbRunFillPageTable from '@/views/sb/run-fill/modules/SbRunFillPageTable'
 import SbInspectionFillPageTable from '@/views/sb/inspection-fill/modules/SbInspectionFillPageTable'
 import DetailSbBom from '@/views/sb/modelbom/modules/DetailSbBom'
@@ -209,7 +208,6 @@ export default {
     RepairApplicationFormTable,
     CheckJobTable,
     SparePartUsedSelectTable,
-    SbOilPageTable,
     SbRunFillPageTable,
     SbInspectionFillPageTable,
     DetailSbBom,
@@ -363,9 +361,15 @@ export default {
       modal.base(this.model)
     },
     handleViewChildSbInfo () {
-      this.visible = false
+      /* this.visible = false
       const modal = this.$refs.detailSbInfoModal
-      modal.base(this.model)
+      modal.base(this.model) */
+      const text = this.$router.resolve({
+        name: 'SbInfo',
+        query: { parentId: this.model.id, parentName: this.model.name }
+      })
+      // 打开一个新的页面
+      window.open(text.href, '_blank')
     },
     handleViewCheck (record) {
       this.visible = false

+ 0 - 2
src/views/sb/info/modules/DetailBak.vue

@@ -115,7 +115,6 @@ import { queryNumCheckjob } from '@/api/check/checkjob'
 import { queryNumPartInfo } from '@/api/part/info'
 import { queryNumModelbom } from '@/api/sb/modelbom'
 import SparePartUsedSelectTable from '@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable'
-import SbOilPageTable from '@/views/sb/oil/modules/SbOilPageTable'
 import SbRunFillPageTable from '@/views/sb/run-fill/modules/SbRunFillPageTable'
 import SbInspectionFillPageTable from '@/views/sb/inspection-fill/modules/SbInspectionFillPageTable'
 import DetailSbBom from '@/views/sb/modelbom/modules/DetailSbBom'
@@ -131,7 +130,6 @@ export default {
     RepairApplicationFormTable,
     CheckJobTable,
     SparePartUsedSelectTable,
-    SbOilPageTable,
     SbRunFillPageTable,
     SbInspectionFillPageTable,
     DetailSbBom,

+ 0 - 2
src/views/sb/info/modules/DetailMeasureRelation.vue

@@ -115,7 +115,6 @@ import { queryNumCheckjob } from '@/api/check/checkjob'
 import { queryNumPartInfo } from '@/api/part/info'
 import { queryNumModelbom } from '@/api/sb/modelbom'
 import SparePartUsedSelectTable from '@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable'
-import SbOilPageTable from '@/views/sb/oil/modules/SbOilPageTable'
 import SbRunFillPageTable from '@/views/sb/run-fill/modules/SbRunFillPageTable'
 import SbInspectionFillPageTable from '@/views/sb/inspection-fill/modules/SbInspectionFillPageTable'
 import DetailSbBom from '@/views/sb/modelbom/modules/DetailSbBom'
@@ -132,7 +131,6 @@ export default {
     RepairApplicationFormTable,
     CheckJobTable,
     SparePartUsedSelectTable,
-    SbOilPageTable,
     SbRunFillPageTable,
     SbInspectionFillPageTable,
     DetailSbBom,

+ 0 - 2
src/views/sb/measure/modules/Detail.vue

@@ -62,7 +62,6 @@ import { queryNumPartInfo } from '@/api/part/info'
 import { queryNumModelbom } from '@/api/sb/modelbom'
 import { queryChildNumSbInfo } from '@/api/sb/info'
 import SparePartUsedSelectTable from '@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable'
-import SbOilPageTable from '@/views/sb/oil/modules/SbOilPageTable'
 import SbRunFillPageTable from '@/views/sb/run-fill/modules/SbRunFillPageTable'
 import SbInspectionFillPageTable from '@/views/sb/inspection-fill/modules/SbInspectionFillPageTable'
 import DetailSbBom from '@/views/sb/modelbom/modules/DetailSbBom'
@@ -82,7 +81,6 @@ export default {
     RepairApplicationFormTable,
     CheckJobTable,
     SparePartUsedSelectTable,
-    SbOilPageTable,
     SbRunFillPageTable,
     SbInspectionFillPageTable,
     DetailSbBom,

+ 0 - 24
src/views/sb/oil/AdminSbOil.vue

@@ -1,24 +0,0 @@
-<template>
-  <sb-oil-page-base :filter="0" />
-</template>
-
-<script>
-import SbOilPageBase from '@/views/sb/oil/modules/SbOilPageBase'
-
-/**
- * 我的记录-查询为我自己填写的数据
- */
-export default {
-  name: 'MySbOil',
-  components: {
-    SbOilPageBase
-  },
-  data () {
-    return {
-    }
-  },
-  created () {
-  },
-  methods: {}
-}
-</script>

+ 0 - 24
src/views/sb/oil/MySbOil.vue

@@ -1,24 +0,0 @@
-<template>
-  <sb-oil-page-base :filter="1" />
-</template>
-
-<script>
-import SbOilPageBase from '@/views/sb/oil/modules/SbOilPageBase'
-
-/**
- * 我的记录-查询为我自己填写的数据
- */
-export default {
-  name: 'MySbOil',
-  components: {
-    SbOilPageBase
-  },
-  data () {
-    return {
-    }
-  },
-  created () {
-  },
-  methods: {}
-}
-</script>

+ 0 - 350
src/views/sb/oil/SbOil.vue

@@ -1,350 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="关键字">
-              <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator">
-      <a-button v-if="$auth('sb-oils-add')" type="primary" icon="plus" @click="$refs.baseModalList.base()">新增</a-button>
-      <a-button style="margin-left: 8px" v-if="$auth('sb-oils-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-oils-del')">
-        <a-menu slot="overlay">
-          <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
-            <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-          </a-popconfirm>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :bordered="this.MyGlobalConstant.BORDERED"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
-      <span slot="action" slot-scope="record">
-        <template>
-          <a @click="handleView(record)">查看</a>
-          <operation-button
-            v-if="$auth('sb-oils-oil')
-              && (record.status === DictCache.VALUE.SB_OIL_STATUS.AGREE
-              || record.status === DictCache.VALUE.SB_OIL_STATUS.OIL
-              )&& record.isOiL"
-            @click="handleHandle(record)"
-          >加油</operation-button>
-          <operation-button
-            v-if="$auth('sb-oils-audit')
-              && record.status === DictCache.VALUE.SB_OIL_STATUS.AGREE && record.isAudit
-              && record.auditType === DictCache.VALUE.SB_OIL_AUDIT_TYPE.SYSTEM
-            "
-            @click="auditHandle(record)"
-          >审批</operation-button>
-          <template
-            v-if="record.createdUserId === userInfo.userId">
-            <template v-if="record.status === DictCache.VALUE.SB_OIL_STATUS.OIL">
-              <operation-button
-                v-if="$auth('sb-oils-confirm')"
-                @click="handleConfirm(record)"
-              >确认</operation-button>
-            </template>
-            <template v-if="record.status === DictCache.VALUE.SB_OIL_STATUS.APPLY">
-              <operation-button
-                v-if="$auth('sb-oils-edit')"
-                @click="handleEdit(record)"
-              >修改</operation-button>
-              <operation-button
-                v-if="$auth('sb-oils-del')"
-                :type="2"
-                title="是否要删除该条数据?"
-                @confirm="batchDelete(record.id)">删除</operation-button>
-            </template>
-
-          </template>
-        </template>
-      </span>
-    </s-table>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <base-form-list ref="baseModalList" @ok="handleOk" />
-    <execute-base-form ref="executeBaseForm" @ok="handleOk" />
-    <audit-base-form ref="auditBaseForm" @ok="handleOk" />
-    <detail ref="detailModal"/>
-  </a-card>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './modules/BaseForm'
-import BaseFormList from './modules/BaseFormList'
-import Detail from './modules/Detail'
-import ExecuteBaseForm from '@/views/sb/oil/modules/ExecuteBaseForm'
-import AuditBaseForm from '@/views/sb/oil/modules/AuditBaseForm'
-import { getSbOilPage, deleteSbOils, fetchSbOil, exportSbOil } from '@/api/sb/oil'
-
-export default {
-  name: 'SbOilList',
-  components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    BaseFormList,
-    ExecuteBaseForm,
-    AuditBaseForm,
-    Detail
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-      },
-      userInfo: this.$store.getters.userInfo,
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备名称',
-          dataIndex: 'sbName'
-        },
-        {
-          title: '设备编号',
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '仓库名称',
-          dataIndex: 'storeName'
-        },
-        {
-          title: '申请人',
-          dataIndex: 'userName'
-        },
-        {
-          title: '申请油量',
-          dataIndex: 'applyOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '实际加油量',
-          dataIndex: 'realOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
-              this.DictCache.COLOR.SB_OIL_STATUS, this.statusMap)
-          }
-        },
-        {
-          title: '审批类型',
-          dataIndex: 'auditType',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.getMapText(this.auditTypeMap, text)
-          }
-        },
-        {
-          title: '仓库管理员',
-          dataIndex: 'storeUserName'
-        },
-        {
-          title: '申请说明',
-          dataIndex: 'applyRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '审批说明',
-          dataIndex: 'remark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '加油说明',
-          dataIndex: 'handleRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      statusMap: {},
-      auditTypeMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam
-        }
-        return getSbOilPage(parameter)
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-    this.auditTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_AUDIT_TYPE)
-    this.tableOption()
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: false,
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteSbOils(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleConfirm (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.executeBaseForm
-        modal.base(res.data)
-      })
-    },
-    auditHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.auditBaseForm
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportSbOil(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleEnter () {
-      this.$refs.table.refresh(true)
-    }
-  }
-}
-</script>

+ 0 - 417
src/views/sb/oil/SbOilAudit.vue

@@ -1,417 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="关键字">
-              <a-input v-model="queryParam.keyword" placeholder="请输入设备编号/仓库名称/设备名称/卡片编号"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="仓库名称">
-              <a-input v-model="queryParam.storeName" placeholder="请输入仓库名称"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="设备型号">
-              <a-select
-                v-model="queryParam.modelId"
-                placeholder="请选择">
-                <a-select-option
-                  v-for="(item,index) in modelList"
-                  :key="index"
-                  :label="item.nameModel"
-                  :value="item.id">{{ item.nameModel }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="状态">
-              <a-select v-model="queryParam.status" placeholder="请选择">
-                <a-select-option
-                  v-for="(label,value) in statusMap"
-                  :key="value"
-                  :label="label"
-                  :value="parseInt(value)">{{ label }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator" v-if="targetId">
-      <a-button type="primary" @click="()=> this.$emit('back')">返回</a-button>
-    </div>
-
-    <div class="table-operator" v-else>
-      <!--<a-button v-if="$auth('sb-oils-add')" type="primary" icon="plus" @click="$refs.baseModalList.base()">新增</a-button>-->
-      <a-popconfirm v-if="$auth('sb-oils-audit')" title="是否要审批所选数据?" @confirm="auditHandleList()">
-        <a-button icon="edit" type="primary">
-          批量审批
-        </a-button>
-      </a-popconfirm>
-      <a-button style="margin-left: 8px" v-if="$auth('sb-oils-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-oils-audit')">
-        <a-menu slot="overlay">
-          <a-popconfirm title="是否要审批所选数据?" @confirm="auditHandleList()">
-            <a-menu-item key="1"><a-icon type="edit" /><a>批量审批</a></a-menu-item>
-          </a-popconfirm>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :bordered="this.MyGlobalConstant.BORDERED"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
-      <span slot="action" slot-scope="record">
-        <template>
-          <a @click="handleView(record)">查看</a>
-          <operation-button
-            v-if="$auth('sb-oils-audit')
-              && ((record.status === DictCache.VALUE.SB_OIL_STATUS.AGREE && record.auditType === 1)
-              ||record.status === DictCache.VALUE.SB_OIL_STATUS.APPLY )
-            "
-            @click="auditHandle(record)"
-          >审批</operation-button>
-        </template>
-      </span>
-    </s-table>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <base-form-list ref="baseModalList" @ok="handleOk" />
-    <execute-base-form ref="executeBaseForm" @ok="handleOk" />
-    <audit-base-form ref="auditBaseForm" @ok="handleOk" />
-    <detail ref="detailModal"/>
-    <audit-base-form-list ref="auditBaseFormList" @ok="handleOk" />
-  </a-card>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './modules/BaseForm'
-import BaseFormList from './modules/BaseFormList'
-import AuditBaseFormList from '@/views/sb/oil/modules/AuditBaseFormList'
-import Detail from './modules/Detail'
-import ExecuteBaseForm from '@/views/sb/oil/modules/ExecuteBaseForm'
-import AuditBaseForm from '@/views/sb/oil/modules/AuditBaseForm'
-import { getSbOilAuditPage, deleteSbOils, fetchSbOil, exportSbOil } from '@/api/sb/oil'
-import { querySbInfo } from '@/api/sb/model'
-
-export default {
-  name: 'SbOilList',
-  components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    AuditBaseFormList,
-    BaseFormList,
-    ExecuteBaseForm,
-    AuditBaseForm,
-    Detail
-  },
-  props: {
-    targetId: {
-      type: String,
-      default: null
-    }
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-      },
-      userInfo: this.$store.getters.userInfo,
-      modelList: [],
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备名称',
-          dataIndex: 'sbName'
-        },
-        {
-          title: '设备编号',
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '仓库名称',
-          dataIndex: 'storeName'
-        },
-        {
-          title: '申请人',
-          dataIndex: 'userName'
-        },
-        {
-          title: '申请油量',
-          dataIndex: 'applyOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '实际加油量',
-          dataIndex: 'realOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
-              this.DictCache.COLOR.SB_OIL_STATUS, this.statusMap)
-          }
-        },
-        {
-          title: '审批类型',
-          dataIndex: 'auditType',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.getMapText(this.auditTypeMap, text)
-          }
-        },
-        {
-          title: '仓库管理员',
-          dataIndex: 'storeUserName'
-        },
-        {
-          title: '申请说明',
-          dataIndex: 'applyRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '审批说明',
-          dataIndex: 'remark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '加油说明',
-          dataIndex: 'handleRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      statusMap: {},
-      auditTypeMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          id: this.targetId,
-          ...this.queryParam
-        }
-        return getSbOilAuditPage(parameter)
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange,
-          getCheckboxProps: record => ({
-            props: {
-              disabled: !((record.status === this.DictCache.VALUE.SB_OIL_STATUS.AGREE && record.auditType === 1) ||
-                record.status === this.DictCache.VALUE.SB_OIL_STATUS.APPLY),
-              name: record.id
-            }
-          })
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    this.initData()
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-    this.auditTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_AUDIT_TYPE)
-    this.tableOption()
-  },
-  methods: {
-    initData () {
-      querySbInfo({}).then(res => {
-        this.modelList = res.data
-      })
-
-      if (this.targetId) {
-        fetchSbOil({ id: this.targetId }).then(res => {
-          const record = res.data
-          if (this.$auth('sb-oils-oil') &&
-            (record.status === this.DictCache.VALUE.SB_OIL_STATUS.AGREE ||
-              record.status === this.DictCache.VALUE.SB_OIL_STATUS.OIL
-            )) {
-            const modal = this.$refs.auditBaseForm
-            modal.base(record)
-          } else {
-            const modal = this.$refs.detailModal
-            modal.base(res.data)
-          }
-        })
-      }
-    },
-    tableOption () {
-      if (!this.optionAlertShow && !this.targetId) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: !((record.status === this.DictCache.VALUE.SB_OIL_STATUS.AGREE && record.auditType === 1) ||
-                  record.status === this.DictCache.VALUE.SB_OIL_STATUS.APPLY),
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    auditHandleList () {
-      const ids = this.selectedRows.map(item => item.id)
-      if (this.BaseTool.Object.isBlank(ids) || ids.length <= 0) {
-        this.$message.info('请选择要审批的记录')
-        return
-      }
-      const modal = this.$refs.auditBaseFormList
-      modal.base(ids)
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteSbOils(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleConfirm (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.executeBaseForm
-        modal.base(res.data)
-      })
-    },
-    auditHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.auditBaseForm
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.$refs.table.clearSelected()
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportSbOil(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleEnter () {
-      this.$refs.table.refresh(true)
-    }
-  }
-}
-</script>

+ 0 - 424
src/views/sb/oil/SbOilTask.vue

@@ -1,424 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="关键字">
-              <a-input v-model="queryParam.keyword" placeholder="请输入设备编号/仓库名称/设备名称/卡片编号"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="仓库名称">
-              <a-input v-model="queryParam.storeName" placeholder="请输入仓库名称"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="设备型号">
-              <a-select
-                v-model="queryParam.modelId"
-                placeholder="请选择">
-                <a-select-option
-                  v-for="(item,index) in modelList"
-                  :key="index"
-                  :label="item.nameModel"
-                  :value="item.id">{{ item.nameModel }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="状态">
-              <a-select v-model="queryParam.status" placeholder="请选择">
-                <a-select-option
-                  v-for="(label,value) in statusMap"
-                  :key="value"
-                  :label="label"
-                  :value="parseInt(value)">{{ label }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator" v-if="targetId">
-      <a-button type="primary" @click="()=> this.$emit('back')">返回</a-button>
-    </div>
-
-    <div class="table-operator" v-else>
-      <!--<a-button v-if="$auth('sb-oils-add')" type="primary" icon="plus" @click="$refs.baseModalList.base()">新增</a-button>-->
-      <a-button v-if="$auth('sb-oils-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-
-      <a-popconfirm
-        style="margin-left: 8px"
-        v-if="$auth('sb-oils-oil')"
-        title="是否要加油所选数据?"
-        @confirm="oilHandleList()">
-        <a-button icon="edit" type="primary">
-          批量加油
-        </a-button>
-      </a-popconfirm>
-
-      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-oils-oil')">
-        <a-menu slot="overlay">
-          <a-popconfirm title="是否要加油所选数据?" @confirm="oilHandleList()">
-            <a-menu-item key="1"><a-icon type="edit" /><a>批量加油</a></a-menu-item>
-          </a-popconfirm>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :bordered="this.MyGlobalConstant.BORDERED"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
-      <span slot="action" slot-scope="record">
-        <template>
-          <a @click="handleView(record)">查看</a>
-          <operation-button
-            v-if="$auth('sb-oils-oil')
-              && (record.status === DictCache.VALUE.SB_OIL_STATUS.AGREE
-              || record.status === DictCache.VALUE.SB_OIL_STATUS.OIL
-              )"
-            @click="handleHandle(record)"
-          >加油</operation-button>
-        </template>
-      </span>
-    </s-table>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <base-form-list ref="baseModalList" @ok="handleOk" />
-    <execute-base-form ref="executeBaseForm" @ok="handleOk" />
-    <audit-base-form ref="auditBaseForm" @ok="handleOk" />
-    <execute-base-form-list ref="executeBaseFormList" @ok="handleOk" />
-    <detail ref="detailModal"/>
-  </a-card>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './modules/BaseForm'
-import BaseFormList from './modules/BaseFormList'
-import Detail from './modules/Detail'
-import ExecuteBaseForm from '@/views/sb/oil/modules/ExecuteBaseForm'
-import AuditBaseForm from '@/views/sb/oil/modules/AuditBaseForm'
-import ExecuteBaseFormList from '@/views/sb/oil/modules/ExecuteBaseFormList'
-import { getSbOilTaskPage, deleteSbOils, fetchSbOil, exportSbOil } from '@/api/sb/oil'
-import { querySbInfo } from '@/api/sb/model'
-
-export default {
-  name: 'SbOilList',
-  components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    BaseFormList,
-    ExecuteBaseFormList,
-    ExecuteBaseForm,
-    AuditBaseForm,
-    Detail
-  },
-  props: {
-    targetId: {
-      type: String,
-      default: null
-    }
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-      },
-      userInfo: this.$store.getters.userInfo,
-      modelList: [],
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备名称',
-          dataIndex: 'sbName'
-        },
-        {
-          title: '设备编号',
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '仓库名称',
-          dataIndex: 'storeName'
-        },
-        {
-          title: '申请人',
-          dataIndex: 'userName'
-        },
-        {
-          title: '申请油量',
-          dataIndex: 'applyOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '实际加油量',
-          dataIndex: 'realOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
-              this.DictCache.COLOR.SB_OIL_STATUS, this.statusMap)
-          }
-        },
-        {
-          title: '审批类型',
-          dataIndex: 'auditType',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.getMapText(this.auditTypeMap, text)
-          }
-        },
-        {
-          title: '仓库管理员',
-          dataIndex: 'storeUserName'
-        },
-        {
-          title: '申请说明',
-          dataIndex: 'applyRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '审批说明',
-          dataIndex: 'remark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '加油说明',
-          dataIndex: 'handleRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      statusMap: {},
-      auditTypeMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          id: this.targetId,
-          ...this.queryParam
-        }
-        return getSbOilTaskPage(parameter)
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange,
-          getCheckboxProps: record => ({
-            props: {
-              disabled: !(record.status === this.DictCache.VALUE.SB_OIL_STATUS.AGREE ||
-                record.status === this.DictCache.VALUE.SB_OIL_STATUS.OIL
-              ),
-              name: record.id
-            }
-          })
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    this.initData()
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-    this.auditTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_AUDIT_TYPE)
-    this.tableOption()
-  },
-  methods: {
-    initData () {
-      querySbInfo({}).then(res => {
-        this.modelList = res.data
-      })
-      if (this.targetId) {
-        fetchSbOil({ id: this.targetId }).then(res => {
-          const record = res.data
-          if (this.$auth('sb-oils-oil') &&
-            (record.status === this.DictCache.VALUE.SB_OIL_STATUS.AGREE ||
-              record.status === this.DictCache.VALUE.SB_OIL_STATUS.OIL
-            )) {
-            const modal = this.$refs.executeBaseForm
-            modal.base(record)
-          } else {
-            const modal = this.$refs.detailModal
-            modal.base(res.data)
-          }
-        })
-      }
-    },
-    tableOption () {
-      if (!this.optionAlertShow && !this.targetId) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: !(record.status === this.DictCache.VALUE.SB_OIL_STATUS.AGREE ||
-                  record.status === this.DictCache.VALUE.SB_OIL_STATUS.OIL
-                ),
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    oilHandleList () {
-      const ids = this.selectedRows.map(item => item.id)
-      if (this.BaseTool.Object.isBlank(ids) || ids.length <= 0) {
-        this.$message.info('请选择要加油的记录')
-        return
-      }
-      const modal = this.$refs.executeBaseFormList
-      modal.base(ids)
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteSbOils(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleConfirm (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.executeBaseForm
-        modal.base(res.data)
-      })
-    },
-    auditHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.auditBaseForm
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.$refs.table.clearSelected()
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportSbOil(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleEnter () {
-      this.$refs.table.refresh(true)
-    }
-  }
-}
-</script>

+ 0 - 333
src/views/sb/oil/SbOilUser.vue

@@ -1,333 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="关键字">
-              <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator">
-      <a-button v-if="$auth('sb-oils-add')" type="primary" icon="plus" @click="$refs.baseModalList.base()">新增</a-button>
-      <a-button style="margin-left: 8px" v-if="$auth('sb-oils-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-oils-del')">
-        <a-menu slot="overlay">
-          <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
-            <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-          </a-popconfirm>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :bordered="this.MyGlobalConstant.BORDERED"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
-      <span slot="action" slot-scope="record">
-        <template>
-          <a @click="handleView(record)">查看</a>
-          <template v-if="record.status === DictCache.VALUE.SB_OIL_STATUS.OIL">
-            <operation-button
-              v-if="$auth('sb-oils-confirm')"
-              @click="handleConfirm(record)"
-            >确认</operation-button>
-          </template>
-          <template v-if="record.status === DictCache.VALUE.SB_OIL_STATUS.APPLY">
-            <operation-button
-              v-if="$auth('sb-oils-edit')"
-              @click="handleEdit(record)"
-            >修改</operation-button>
-            <operation-button
-              v-if="$auth('sb-oils-del')"
-              :type="2"
-              title="是否要删除该条数据?"
-              @confirm="batchDelete(record.id)">删除</operation-button>
-          </template>
-
-        </template>
-      </span>
-    </s-table>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <base-form-list ref="baseModalList" @ok="handleOk" />
-    <execute-base-form ref="executeBaseForm" @ok="handleOk" />
-    <audit-base-form ref="auditBaseForm" @ok="handleOk" />
-    <detail ref="detailModal"/>
-  </a-card>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './modules/BaseForm'
-import BaseFormList from './modules/BaseFormList'
-import Detail from './modules/Detail'
-import ExecuteBaseForm from '@/views/sb/oil/modules/ExecuteBaseForm'
-import AuditBaseForm from '@/views/sb/oil/modules/AuditBaseForm'
-import { getSbOilUserPage, deleteSbOils, fetchSbOil, exportSbOil } from '@/api/sb/oil'
-
-export default {
-  name: 'SbOilList',
-  components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    BaseFormList,
-    ExecuteBaseForm,
-    AuditBaseForm,
-    Detail
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-      },
-      userInfo: this.$store.getters.userInfo,
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备名称',
-          dataIndex: 'sbName'
-        },
-        {
-          title: '设备编号',
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '仓库名称',
-          dataIndex: 'storeName'
-        },
-        {
-          title: '申请人',
-          dataIndex: 'userName'
-        },
-        {
-          title: '申请油量',
-          dataIndex: 'applyOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '实际加油量',
-          dataIndex: 'realOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
-              this.DictCache.COLOR.SB_OIL_STATUS, this.statusMap)
-          }
-        },
-        {
-          title: '审批类型',
-          dataIndex: 'auditType',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.getMapText(this.auditTypeMap, text)
-          }
-        },
-        {
-          title: '仓库管理员',
-          dataIndex: 'storeUserName'
-        },
-        {
-          title: '申请说明',
-          dataIndex: 'applyRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '审批说明',
-          dataIndex: 'remark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '加油说明',
-          dataIndex: 'handleRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      statusMap: {},
-      auditTypeMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam
-        }
-        return getSbOilUserPage(parameter)
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-    this.auditTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_AUDIT_TYPE)
-    this.tableOption()
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: false,
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteSbOils(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleConfirm (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.executeBaseForm
-        modal.base(res.data)
-      })
-    },
-    auditHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.auditBaseForm
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportSbOil(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleEnter () {
-      this.$refs.table.refresh(true)
-    }
-  }
-}
-</script>

+ 0 - 24
src/views/sb/oil/ZGSbOil.vue

@@ -1,24 +0,0 @@
-<template>
-  <sb-oil-page-base :filter="2" />
-</template>
-
-<script>
-import SbOilPageBase from '@/views/sb/oil/modules/SbOilPageBase'
-
-/**
- * 我的记录-查询为我自己填写的数据
- */
-export default {
-  name: 'MySbOil',
-  components: {
-    SbOilPageBase
-  },
-  data () {
-    return {
-    }
-  },
-  created () {
-  },
-  methods: {}
-}
-</script>

+ 0 - 237
src/views/sb/oil/modules/AuditBaseForm.vue

@@ -1,237 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    class="ant-modal2"
-    @cancel="handleCancel"
-  >
-    <a-form :form="form">
-      <row-list :col="1" v-show="false">
-        <row-item>
-          <a-form-item>
-            <a-input v-decorator="['id']" type="hidden"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item>
-            <a-input v-decorator="['sbId']" type="hidden"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item>
-            <a-input v-decorator="['storeId']" type="hidden"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-      <row-list :col="2">
-        <row-item>
-          <a-form-item
-            label="设备名称"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.sbName }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="设备编号"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.sbNo }}</label>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="仓库名称"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.storeName }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="申请油量"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ BaseTool.Amount.formatter(model.applyOil) }}升</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="燃油类型"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.spareName }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item v-show="false">
-          <a-form-item
-            label="工程项目"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.projectQuantityName }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="用途"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.reason }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="申请说明"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.applyRemark }}</label>
-          </a-form-item>
-        </row-item>
-
-        <a-divider />
-
-        <row-item>
-
-          <a-form-item
-            label="状态"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select
-              @change="statusChange"
-              v-decorator="['status', {initialValue: parseInt(DictCache.VALUE.SB_OIL_STATUS.AGREE),rules: [{required: true, message: '状态不能为空'}]}]"
-              placeholder="请选择">
-              <a-select-option
-                :key="2"
-                label="同意"
-                :value="parseInt(DictCache.VALUE.SB_OIL_STATUS.AGREE)">同意
-              </a-select-option>
-              <a-select-option
-                :key="4"
-                label="不同意"
-                :value="parseInt(DictCache.VALUE.SB_OIL_STATUS.NOT_AGREE)">不同意
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-      </row-list>
-      <row-list :col="1">
-        <row-item>
-          <a-form-item
-            label="说明"
-            :labelCol="BaseTool.Constant.labelCol2"
-            :wrapperCol="BaseTool.Constant.wrapperCol2"
-          >
-            <a-textarea
-              :rows="4"
-              v-decorator="['remark']"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-    </a-form>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import pick from 'lodash.pick'
-import { updateAuditSbOil } from '@/api/sb/oil'
-
-export default {
-  name: 'BaseSbOil',
-  components: {
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      modalTitle: null,
-      form: this.$form.createForm(this),
-      status: 2,
-      model: {},
-      visible: false,
-      // 下拉框map
-      statusMap: {}
-    }
-  },
-  props: {},
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-  },
-  methods: {
-    base (record) {
-      this.visible = true
-      // 如果是空标识添加
-      if (this.BaseTool.Object.isBlank(record.id)) {
-        this.modalTitle = '添加'
-      } else {
-        this.modalTitle = '审批'
-      }
-      const { form: { setFieldsValue } } = this
-      this.model = record
-      // 日期处理
-      this.$nextTick(() => {
-        setFieldsValue(Object.assign(pick(record, [
-          'id'
-        ])))
-      })
-    },
-    statusChange (val) {
-      console.log(val)
-      this.status = val
-    },
-    save () {
-      const { form: { validateFieldsAndScroll } } = this
-      this.confirmLoading = true
-      validateFieldsAndScroll((errors, values) => {
-        if (errors) {
-          this.confirmLoading = false
-          return
-        }
-        updateAuditSbOil(values)
-          .then(() => {
-            this.handleCancel(values)
-          }).catch(() => {
-            this.confirmLoading = false
-          })
-      })
-    },
-    handleCancel (values) {
-      this.visible = false
-      this.confirmLoading = false
-      this.form.resetFields()
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok', values)
-      }
-    }
-
-  }
-}
-</script>

+ 0 - 121
src/views/sb/oil/modules/AuditBaseFormList.vue

@@ -1,121 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    class="ant-modal2"
-    @cancel="handleCancel"
-  >
-    <a-form :form="form">
-      <row-list :col="2">
-        <row-item>
-
-          <a-form-item
-            label="状态"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select
-              @change="statusChange"
-              v-decorator="['status', {initialValue: parseInt(DictCache.VALUE.SB_OIL_STATUS.AGREE),rules: [{required: true, message: '状态不能为空'}]}]"
-              placeholder="请选择">
-              <a-select-option
-                :key="2"
-                label="同意"
-                :value="parseInt(DictCache.VALUE.SB_OIL_STATUS.AGREE)">同意
-              </a-select-option>
-              <a-select-option
-                :key="4"
-                label="不同意"
-                :value="parseInt(DictCache.VALUE.SB_OIL_STATUS.NOT_AGREE)">不同意
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-      </row-list>
-      <row-list :col="1">
-        <row-item>
-          <a-form-item
-            label="说明"
-            :labelCol="BaseTool.Constant.labelCol2"
-            :wrapperCol="BaseTool.Constant.wrapperCol2"
-          >
-            <a-textarea
-              :rows="4"
-              v-decorator="['remark']"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-    </a-form>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import { updateAuditSbOilList } from '@/api/sb/oil'
-
-export default {
-  name: 'BaseSbOil',
-  components: {
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      modalTitle: null,
-      form: this.$form.createForm(this),
-      status: 2,
-      ids: [],
-      model: {},
-      visible: false,
-      // 下拉框map
-      statusMap: {}
-    }
-  },
-  props: {},
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-  },
-  methods: {
-    base (ids) {
-      this.visible = true
-      // 如果是空标识添加
-      this.modalTitle = '批量审批'
-      this.ids = ids
-    },
-    statusChange (val) {
-      console.log(val)
-      this.status = val
-    },
-    save () {
-      const { form: { validateFieldsAndScroll } } = this
-      this.confirmLoading = true
-      validateFieldsAndScroll((errors, values) => {
-        if (errors) {
-          this.confirmLoading = false
-          return
-        }
-        values.ids = this.ids
-        updateAuditSbOilList(values)
-          .then(() => {
-            this.handleCancel(values)
-          }).catch(() => {
-            this.confirmLoading = false
-          })
-      })
-    },
-    handleCancel (values) {
-      this.visible = false
-      this.confirmLoading = false
-      this.form.resetFields()
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok', values)
-      }
-    }
-
-  }
-}
-</script>

+ 0 - 88
src/views/sb/oil/modules/BaseForm.vue

@@ -1,88 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    class="ant-modal2"
-    @cancel="handleCancel"
-  >
-    <detail-list title="" :col="2">
-      <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
-      <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
-      <detail-list-item term="仓库名称">{{ model.storeName }}</detail-list-item>
-      <detail-list-item term="申请人">{{ model.userName }}</detail-list-item>
-      <detail-list-item term="申请油量">{{ BaseTool.Amount.formatter(model.applyOil) }}升</detail-list-item>
-      <detail-list-item term="审批人">{{ model.auditType===DictCache.VALUE.SB_OIL_AUDIT_TYPE.USER?model.auditUserName:'系统' }}</detail-list-item>
-      <detail-list-item term="燃油类型">{{ model.spareName }}</detail-list-item>
-      <detail-list-item v-show="false" term="工程项目">{{ model.projectQuantityName }}</detail-list-item>
-      <detail-list-item term="用途">{{ model.reason }}</detail-list-item>
-      <detail-list-item term="审批状态">{{ auditTypeMap[model.auditType] }}</detail-list-item>
-      <detail-list-item term="仓库管理员">{{ model.storeUserName }}</detail-list-item>
-      <detail-list-item term="实际加油量">{{ BaseTool.Amount.formatter(model.realOil) }}升</detail-list-item>
-      <detail-list-item term="状态"><badge :status="DictCache.COLOR.SB_OIL_STATUS[model.status]" :text="statusMap[model.status]"></badge></detail-list-item>
-    </detail-list>
-    <detail-list :col="1">
-      <detail-list-item term="申请说明">{{ model.applyRemark }}&nbsp;&nbsp;</detail-list-item>
-      <detail-list-item term="审批说明">{{ model.remark }}&nbsp;&nbsp;</detail-list-item>
-      <detail-list-item term="加油说明">{{ model.handleRemark }}&nbsp;&nbsp;</detail-list-item>
-    </detail-list>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="save()">确认</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import { updateConfirmSbOil } from '@/api/sb/oil'
-import DetailList from '@/components/tools/DetailList'
-const DetailListItem = DetailList.Item
-
-export default {
-  name: 'BaseSbOil',
-  components: {
-    DetailList,
-    DetailListItem
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      modalTitle: null,
-      visible: false,
-      model: {},
-      // 下拉框map
-      statusMap: {},
-      auditTypeMap: {}
-    }
-  },
-  props: {},
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-    this.auditTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_AUDIT_TYPE)
-  },
-  methods: {
-    base (record) {
-      this.visible = true
-      this.modalTitle = '确认'
-      this.model = record
-    },
-    save () {
-      updateConfirmSbOil({ id: this.model.id })
-        .then(() => {
-          this.handleCancel({ id: this.model.id })
-        }).catch(() => {
-          this.confirmLoading = false
-        })
-    },
-    handleCancel (values) {
-      this.visible = false
-      this.confirmLoading = false
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok', values)
-      }
-    }
-
-  }
-}
-</script>

+ 0 - 296
src/views/sb/oil/modules/BaseFormList.vue

@@ -1,296 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="1100"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @cancel="handleCancel"
-  >
-    <div :style="{ marginBottom: '16px' }">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-          <a-col :span="4">
-            <a-button type="primary" icon="plus" @click="add" :loading="addSbConfirmLoading">
-              新增设备
-            </a-button>
-          </a-col>
-          <a-col :span="8">
-            <a-button
-              style="margin-left: 8px"
-              type="primary"
-              @click="()=> this.$refs.storeSelectModal.base({},{},{filter: 2})">
-              选择仓库
-            </a-button>
-            <span style="margin-left: 8px;">{{ store.name || '未选择' }}</span>
-          </a-col>
-          <a-col :span="6">
-            <a-button
-              style="margin-left: 8px"
-              type="primary"
-              @click="handleSpareSelect">
-              选择燃油
-            </a-button>
-            <span style="margin-left: 8px;">{{ spareStore.spareName || '未选择' }}</span>
-          </a-col>
-          <a-col :span="6" v-show="false">
-            <a-form-item label="工程项目">
-              <a-select
-                style="width: 150px;"
-                @change="projectQuantityChange"
-                v-model="projectQuantityId"
-                placeholder="请选择">
-                <a-select-option
-                  v-for="(item,index) in projectQuantityList"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.id">{{ item.name }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <a-tabs v-if="sbInfos.length>0" v-model="activeKey" hide-add type="editable-card" @edit="onEdit">
-      <a-tab-pane :force-render="true" v-for="pane in sbInfos" :key="pane.sbId" :tab="pane.sbName" :closable="pane.closable">
-        <oil-add-form :project-quantity-list="projectQuantityList" :ref="pane.sbId" :oil-model="pane" />
-      </a-tab-pane>
-    </a-tabs>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-    </template>
-    <sb-info-select-modal-by-user :type="'checkbox'" ref="sbInfoSelectModalByUser" @selected="handleSbSelected"/>
-    <store-select-modal ref="storeSelectModal" @selected="handleStoreSelected"/>
-    <spare-store-page-modal ref="spareStorePageModal" :type="'radio'" @selected="handleSpareStoreSelected"/>
-  </a-modal>
-</template>
-
-<script>
-import SbInfoSelectModalByUser from '@/views/sb/info/modules/SbInfoSelectModalByFilter'
-import OilAddForm from '@/views/sb/oil/modules/OilAddForm'
-import { fetchSbOilBySbId, addSbOilList } from '@/api/sb/oil'
-import StoreSelectModal from '@/views/store/store/modules/StoreSelectModal'
-import SpareStorePageModal from '@/views/store/sparestore/modules/SpareStorePageModal'
-import { queryFillProjectQuantityDeptProject } from '@/api/fill/project-quantity'
-
-export default {
-  name: 'BaseSbRunFillList',
-  components: {
-    SbInfoSelectModalByUser,
-    StoreSelectModal,
-    OilAddForm,
-    SpareStorePageModal
-  },
-  props: {
-    oilFilter: {
-      type: Number,
-      default: 1
-    }
-  },
-  data () {
-    return {
-      activeKey: null,
-      sbInfos: [
-      ],
-      store: {},
-      spareStore: {},
-      projectQuantityId: null,
-      useType: null,
-      newTabIndex: 0,
-      addSbConfirmLoading: false,
-      confirmLoading: false,
-      projectQuantityList: [],
-      modalTitle: null,
-      visible: false
-      // 下拉框map
-    }
-  },
-  created () {
-    // 下拉框map
-    queryFillProjectQuantityDeptProject().then(res => {
-      this.projectQuantityList = res.data
-    })
-  },
-  methods: {
-    base (record, useType) {
-      this.visible = true
-      this.modalTitle = '加油申请'
-    },
-    callback (key) {
-      console.log(key)
-    },
-    onEdit (targetKey, action) {
-      this[action](targetKey)
-    },
-    add () {
-      let sbFilter = 1
-      if (this.oilFilter === 1) {
-        // 我的设备列表
-        sbFilter = 1
-      } else if (this.oilFilter === 2) {
-        // 主管的设备列表
-        sbFilter = 2
-      }
-      this.$refs.sbInfoSelectModalByUser.base({ filter: sbFilter })
-    },
-    handleSpareSelect () {
-      if (this.BaseTool.Object.isBlank(this.store) || this.BaseTool.String.isBlank(this.store.id)) {
-        this.$message.error('请先选择仓库')
-        return
-      }
-      const storeId = this.store.id
-      this.$refs.spareStorePageModal.base({}, { storeId: storeId, num: 0, typeNameLike: '燃油' })
-    },
-    handleStoreSelected (record, keys, rows) {
-      const [ row ] = rows
-      this.store = row
-      this.spareStore = {}
-      this.sbInfos.forEach(sbInfo => {
-        const setFieldsValue = this.$refs[sbInfo.sbId][0].form.setFieldsValue
-        setFieldsValue({
-          'storeId': row.id,
-          'storeName': row.name,
-          'spareName': null,
-          'spareStoreId': null
-        })
-      })
-    },
-    handleSpareStoreSelected (record, keys, rows) {
-      const [ row ] = rows
-      this.spareStore = row
-      this.sbInfos.forEach(sbInfo => {
-        const setFieldsValue = this.$refs[sbInfo.sbId][0].form.setFieldsValue
-        setFieldsValue({
-          'spareStoreId': row.id,
-          'spareName': row.spareName
-        })
-      })
-    },
-    projectQuantityChange (val) {
-      this.sbInfos.forEach(sbInfo => {
-        const setFieldsValue = this.$refs[sbInfo.sbId][0].form.setFieldsValue
-        setFieldsValue({
-          'projectQuantityId': val
-        })
-      })
-    },
-    remove (targetKey1) {
-      let activeKey = this.activeKey
-      let lastIndex
-      this.sbInfos.forEach((pane, i) => {
-        if (pane.sbId === targetKey1) {
-          lastIndex = i - 1
-        }
-      })
-      const sbInfos = this.sbInfos.filter(pane => pane.sbId !== targetKey1)
-      if (sbInfos.length && activeKey === targetKey1) {
-        if (lastIndex >= 0) {
-          activeKey = sbInfos[lastIndex].sbId
-        } else {
-          activeKey = sbInfos[0].sbId
-        }
-      }
-      this.sbInfos = sbInfos
-      this.activeKey = activeKey
-    },
-    save () {
-      this.confirmLoading = true
-      const saveList = []
-      let isSuccess = true
-      // 循环处理数据
-      for (const sbInfo of this.sbInfos) {
-        if (isSuccess) {
-          const validateFieldsAndScroll = this.$refs[sbInfo.sbId][0].form.validateFieldsAndScroll
-          validateFieldsAndScroll((errors, values) => {
-            if (errors) {
-              this.confirmLoading = false
-              this.$message.error(sbInfo.sbName + '中有数据错误,提示信息:' + Object.values(errors)[0].errors[0].message)
-              isSuccess = false
-              return
-            }
-            saveList.push(values)
-          })
-        }
-      }
-      if (isSuccess) {
-        addSbOilList(saveList).then(res => {
-          this.handleCancel(saveList)
-        }).catch(() => {
-          this.confirmLoading = false
-        })
-      }
-    },
-    handleSbSelect () {
-      this.$refs.sbInfoSelectModal.base({})
-    },
-    handleSbSelected (keys, rows) {
-      const [ key ] = keys
-      // 日期处理
-      const sbInfos = this.sbInfos
-      for (const sbInfo of sbInfos) {
-        if (sbInfo.sbId === key) {
-          this.$message.error('该设备已选择,请重新选择设备')
-          return
-        }
-      }
-      this.addSbConfirmLoading = true
-      const promiseList = []
-      rows.forEach((item, index, arr) => {
-        const promise = new Promise((resolve, reject) => {
-          fetchSbOilBySbId({ sbId: item.id }).then(res => {
-            const response = {}
-            response.sbInfo = item
-            response.model = res.data
-            resolve(response)
-          }, () => {
-            reject(new Error(null))
-          })
-        })
-        promiseList.push(promise)
-      })
-      Promise.all(promiseList).then(res => {
-        const activeKey = `${res[0].sbInfo.id}`
-        res.forEach((item, index, arr) => {
-          let s = {}
-          if (this.BaseTool.Object.isNotBlank(item.model)) {
-            s = item.model
-          } else {
-            s = {
-              'sbId': item.sbInfo.id,
-              'sbNo': item.sbInfo.no,
-              'sbName': item.sbInfo.name,
-              'sbCardNo': item.sbInfo.cardNo
-            }
-          }
-          if (this.BaseTool.Object.isNotBlank(this.store) && this.BaseTool.String.isNotBlank(this.store.id)) {
-            s.storeId = this.store.id
-            s.storeName = this.store.name
-          }
-          if (this.BaseTool.Object.isNotBlank(this.spareStore) && this.BaseTool.String.isNotBlank(this.spareStore.id)) {
-            s.spareStoreId = this.spareStore.id
-            s.spareName = this.spareStore.spareName
-          }
-          if (this.BaseTool.String.isNotBlank(this.projectQuantityId)) {
-            s.projectQuantityId = this.projectQuantityId
-          }
-          sbInfos.push(s)
-        })
-        this.sbInfos = sbInfos
-        this.activeKey = activeKey
-      }).finally(res => {
-        this.addSbConfirmLoading = false
-      })
-    },
-    handleCancel (values) {
-      this.visible = false
-      this.confirmLoading = false
-      this.store = {}
-      this.sbInfos = []
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok', values)
-      }
-    }
-
-  }
-}
-</script>

+ 0 - 101
src/views/sb/oil/modules/ConfirmBaseForm.vue

@@ -1,101 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="850"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    class="ant-modal2"
-    @cancel="handleCancel"
-  >
-    <detail-list title="" :col="2">
-      <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
-      <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
-      <detail-list-item term="仓库名称">{{ model.storeName }}</detail-list-item>
-      <detail-list-item term="申请人">{{ model.userName }}</detail-list-item>
-      <detail-list-item term="燃油类型">{{ model.spareName }}</detail-list-item>
-      <detail-list-item v-show="false" term="工程项目">{{ model.projectQuantityName }}</detail-list-item>
-      <detail-list-item term="用途">{{ model.reason }}</detail-list-item>
-      <detail-list-item term="处理人">{{ model.storeUserName }}</detail-list-item>
-      <detail-list-item term="状态"><badge :status="DictCache.COLOR.SB_OIL_STATUS[model.status]" :text="statusMap[model.status]"></badge></detail-list-item>
-      <detail-list-item term="申请油量">{{ BaseTool.Amount.formatter(model.applyOil) }}升</detail-list-item>
-      <detail-list-item term="实际加油量">{{ BaseTool.Amount.formatter(model.realOil) }}升</detail-list-item>
-      <detail-list-item term="创建日期">{{ model.createdTime }}</detail-list-item>
-      <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-      <detail-list-item term="申请说明">{{ model.applyRemark }}&nbsp;</detail-list-item>
-      <detail-list-item term="加油说明">{{ model.handleRemark }}&nbsp;</detail-list-item>
-    </detail-list>
-
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="save()">确定</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import DetailList from '@/components/tools/DetailList'
-import { updateConfirmSbOil } from '@/api/sb/oil'
-const DetailListItem = DetailList.Item
-
-export default {
-  name: 'SbOilDetail',
-  components: {
-    DetailList,
-    DetailListItem
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      mdl: {},
-      modalTitle: null,
-      visible: false,
-      // 下拉框map
-      statusMap: {},
-      model: {
-        'sbId': null,
-        'storeId': null,
-        'userId': null,
-        'userName': null,
-        'storeUserId': null,
-        'storeUserName': null,
-        'status': null,
-        'applyOil': null,
-        'realOil': null,
-        'applyRemark': null,
-        'handleRemark': null,
-        'remark': null,
-        'createdUserId': null,
-        'updateUserId': null,
-        'updateUserName': null,
-        'updateTime': null,
-        'isOiL': null,
-        'isAudit': null
-      }
-    }
-  },
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-  },
-  methods: {
-    base (record) {
-      this.visible = true
-      this.modalTitle = '详情'
-      this.model = record
-    },
-    save () {
-      updateConfirmSbOil({ id: this.model.id })
-        .then(() => {
-          this.handleCancel({ id: this.model.id })
-        }).catch(() => {
-          this.confirmLoading = false
-        })
-    },
-    handleCancel () {
-      this.visible = false
-      this.confirmLoading = false
-      this.$emit('ok', '')
-    }
-
-  }
-}
-</script>

+ 0 - 101
src/views/sb/oil/modules/Detail.vue

@@ -1,101 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="850"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    class="ant-modal2"
-    @cancel="handleCancel"
-  >
-    <detail-list title="" :col="2">
-      <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
-      <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
-      <detail-list-item term="仓库名称">{{ model.storeName }}</detail-list-item>
-      <detail-list-item term="申请人">{{ model.userName }}</detail-list-item>
-      <detail-list-item term="申请油量">{{ BaseTool.Amount.formatter(model.applyOil) }}升</detail-list-item>
-      <detail-list-item term="燃油类型">{{ model.spareName }}</detail-list-item>
-      <detail-list-item v-show="false" term="工程项目">{{ model.projectQuantityName }}</detail-list-item>
-      <detail-list-item term="用途">{{ model.reason }}</detail-list-item>
-      <detail-list-item term="审批人">{{ model.auditUserName||'系统' }}</detail-list-item>
-      <detail-list-item term="审批状态">{{ auditTypeMap[model.auditType] }}</detail-list-item>
-      <detail-list-item term="仓库管理员">{{ model.storeUserName }}</detail-list-item>
-      <detail-list-item term="实际加油量">{{ BaseTool.Amount.formatter(model.realOil) }}{{ model.realOil?'升': '' }}</detail-list-item>
-      <detail-list-item term="状态"><badge :status="DictCache.COLOR.SB_OIL_STATUS[model.status]" :text="statusMap[model.status]"></badge></detail-list-item>
-    </detail-list>
-    <detail-list :col="1">
-      <detail-list-item term="申请说明">{{ model.applyRemark }}&nbsp;&nbsp;</detail-list-item>
-      <detail-list-item term="审批说明">{{ model.remark }}&nbsp;&nbsp;</detail-list-item>
-      <detail-list-item term="加油说明">{{ model.handleRemark }}&nbsp;&nbsp;</detail-list-item>
-    </detail-list>
-
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import DetailList from '@/components/tools/DetailList'
-const DetailListItem = DetailList.Item
-
-export default {
-  name: 'SbOilDetail',
-  components: {
-    DetailList,
-    DetailListItem
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      mdl: {},
-      modalTitle: null,
-      visible: false,
-      // 下拉框map
-      statusMap: {},
-      auditTypeMap: {},
-      model: {
-        'sbId': null,
-        'storeId': null,
-        'userId': null,
-        'userName': null,
-        'storeUserId': null,
-        'storeUserName': null,
-        'status': null,
-        'applyOil': null,
-        'realOil': null,
-        'applyRemark': null,
-        'handleRemark': null,
-        'remark': null,
-        'createdUserId': null,
-        'updateUserId': null,
-        'updateUserName': null,
-        'updateTime': null,
-        'projectQuantityName': null,
-        'isOiL': null,
-        'isAudit': null,
-        'isUpdate': null,
-        'auditType': null,
-        'auditUserName': null
-      }
-    }
-  },
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-    this.auditTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_AUDIT_TYPE)
-  },
-  methods: {
-    base (record) {
-      this.visible = true
-      this.modalTitle = '详情'
-      this.model = record
-    },
-    handleCancel () {
-      this.visible = false
-      this.confirmLoading = false
-      this.$emit('ok', '')
-    }
-
-  }
-}
-</script>

+ 0 - 220
src/views/sb/oil/modules/ExecuteBaseForm.vue

@@ -1,220 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    class="ant-modal2"
-    @cancel="handleCancel"
-  >
-    <a-form :form="form">
-      <row-list :col="1" v-show="false">
-        <row-item>
-          <a-form-item>
-            <a-input v-decorator="['id']" type="hidden"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-      <row-list :col="2">
-        <row-item>
-          <a-form-item
-            label="设备名称"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.sbName }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="设备编号"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.sbNo }}</label>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="仓库名称"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.storeName }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="申请油量"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ BaseTool.Amount.formatter(model.applyOil) }}升</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="燃油类型"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.spareName }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item v-show="false">
-          <a-form-item
-            label="工程项目"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.projectQuantityName }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="用途"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.reason }}</label>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="申请说明"
-            class="marginBottom"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <label>{{ model.applyRemark }}</label>
-          </a-form-item>
-        </row-item>
-
-        <a-divider />
-        <row-item>
-          <a-form-item
-            label="实际加油量"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              style="width: 80%"
-              :min="0"
-              :step="0.01"
-              :formatter="BaseTool.Amount.formatter"
-              :parser="BaseTool.Amount.parser"
-              v-decorator="['realOil', {initialValue: model.realOil||model.applyOil,rules: [{required: true, message: '实际加油量不能为空'}]}]"/>
-            <span class="ant-input-group-addon" style="display: inline-block; width: 20%;height: 31px;line-height: 31px;margin-bottom: 6px;">升</span>
-          </a-form-item>
-        </row-item>
-      </row-list>
-      <row-list :col="1">
-        <row-item>
-          <a-form-item
-            label="说明"
-            :labelCol="BaseTool.Constant.labelCol2"
-            :wrapperCol="BaseTool.Constant.wrapperCol2"
-          >
-            <a-textarea
-              :rows="4"
-              v-decorator="['handleRemark',{initialValue: model.remark}]"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-    </a-form>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import pick from 'lodash.pick'
-import { updateOilSbOil } from '@/api/sb/oil'
-
-export default {
-  name: 'BaseSbOil',
-  components: {
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      modalTitle: null,
-      form: this.$form.createForm(this),
-      status: 2,
-      model: {},
-      visible: false,
-      // 下拉框map
-      statusMap: {}
-    }
-  },
-  props: {},
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-  },
-  methods: {
-    base (record) {
-      this.visible = true
-      // 如果是空标识添加
-      if (this.BaseTool.Object.isBlank(record.id)) {
-        this.modalTitle = '添加'
-      } else {
-        this.modalTitle = '填报'
-      }
-      const { form: { setFieldsValue } } = this
-      this.model = record
-      // 日期处理
-      this.$nextTick(() => {
-        setFieldsValue(Object.assign(pick(record, [
-          'id'
-        ])))
-      })
-    },
-    statusChange (val) {
-      console.log(val)
-      this.status = val
-    },
-    save () {
-      const { form: { validateFieldsAndScroll } } = this
-      this.confirmLoading = true
-      validateFieldsAndScroll((errors, values) => {
-        if (errors) {
-          console.log(44444, values)
-          this.confirmLoading = false
-          return
-        }
-        console.log(33333, values)
-        updateOilSbOil(values)
-          .then(() => {
-            this.handleCancel(values)
-          }).catch(() => {
-            this.confirmLoading = false
-          })
-      })
-    },
-    handleCancel (values) {
-      this.visible = false
-      this.confirmLoading = false
-      this.form.resetFields()
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok', values)
-      }
-    }
-
-  }
-}
-</script>

+ 0 - 95
src/views/sb/oil/modules/ExecuteBaseFormList.vue

@@ -1,95 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    class="ant-modal2"
-    @cancel="handleCancel"
-  >
-    <a-form :form="form">
-      <row-list :col="1">
-        <row-item>
-          <a-form-item
-            label="说明"
-            :labelCol="BaseTool.Constant.labelCol2"
-            :wrapperCol="BaseTool.Constant.wrapperCol2"
-          >
-            <a-textarea
-              :rows="4"
-              v-decorator="['handleRemark',{initialValue: model.remark}]"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-    </a-form>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import { updateOilSbOilList } from '@/api/sb/oil'
-
-export default {
-  name: 'BaseSbOil',
-  components: {
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      modalTitle: null,
-      form: this.$form.createForm(this),
-      status: 2,
-      model: {},
-      visible: false,
-      // 下拉框map
-      statusMap: {},
-      ids: []
-    }
-  },
-  props: {},
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-  },
-  methods: {
-    base (ids) {
-      this.visible = true
-      // 如果是空标识添加
-      this.modalTitle = '批量加油'
-      this.ids = ids
-    },
-    statusChange (val) {
-      console.log(val)
-      this.status = val
-    },
-    save () {
-      const { form: { validateFieldsAndScroll } } = this
-      this.confirmLoading = true
-      validateFieldsAndScroll((errors, values) => {
-        if (errors) {
-          this.confirmLoading = false
-          return
-        }
-        values.ids = this.ids
-        updateOilSbOilList(values)
-          .then(() => {
-            this.handleCancel(values)
-          }).catch(() => {
-            this.confirmLoading = false
-          })
-      })
-    },
-    handleCancel (values) {
-      this.visible = false
-      this.confirmLoading = false
-      this.form.resetFields()
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok', values)
-      }
-    }
-
-  }
-}
-</script>

+ 0 - 261
src/views/sb/oil/modules/OilAddForm.vue

@@ -1,261 +0,0 @@
-<template>
-  <div>
-    <a-form :form="form">
-      <row-list :col="1" v-show="false">
-        <row-item>
-          <a-form-item>
-            <a-input v-decorator="['sbId',{initialValue: oilModel.sbId}]" type="hidden"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item>
-            <a-input v-decorator="['storeId',{initialValue: oilModel.storeId}]" type="hidden"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item>
-            <a-input v-decorator="['spareStoreId',{initialValue: oilModel.spareStoreId}]" type="hidden"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-      <row-list :col="2">
-        <row-item>
-
-          <a-form-item
-            label="设备名称"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              disabled
-              v-decorator="['sbName', {initialValue: oilModel.sbName}]"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="设备编号"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              disabled
-              v-decorator="['sbNo', {initialValue: oilModel.sbNo}]"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-
-          <a-form-item
-            label="设备卡片编号"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              disabled
-              v-decorator="['sbCardNo', {initialValue: oilModel.sbCardNo}]"/>
-          </a-form-item>
-        </row-item>
-        <row-item>
-
-          <a-form-item
-            label="仓库名称"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              disabled
-              style="width:60%;margin-right:5px"
-              v-decorator="['storeName', {initialValue: oilModel.storeName,rules: [{required: true, message: '仓库不能为空'}]}]" />
-            <a-button type="primary" @click="()=> this.$refs.storeSelectModal.base({},{},{filter: 2})">选择仓库</a-button>
-          </a-form-item>
-        </row-item>
-
-        <row-item>
-          <a-form-item
-            label="燃油类型"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              disabled
-              style="width:60%;margin-right:5px"
-              v-decorator="['spareName', {initialValue: oilModel.spareName,rules: [{required: true, message: '燃油类型不能为空'}]}]" />
-            <a-button type="primary" @click="handleSpareSelect">选择燃油</a-button>
-          </a-form-item>
-        </row-item>
-
-        <row-item v-if="false">
-          <a-form-item
-            label="工程项目"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select
-              v-decorator="['projectQuantityId',
-                            {initialValue: oilModel.projectQuantityId,rules: [{required: true, message: '作业名称不能为空'}]}]"
-              placeholder="请选择">
-              <a-select-option
-                v-for="(item,index) in projectQuantityList"
-                :key="index"
-                :label="item.name"
-                :value="item.id">{{ item.name }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="用途"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['reason', {initialValue: oilModel.reason,rules: [{required: true, message: '用途不能为空'}]}]" placeholder="请选择">
-              <a-select-option value="施工领用">
-                施工领用
-              </a-select-option>
-              <a-select-option value="办公领用">
-                办公领用
-              </a-select-option>
-              <a-select-option value="维修领用">
-                维修领用
-              </a-select-option>
-              <a-select-option value="其他领用">
-                其他领用
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="申请油量"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input-number
-              style="width: 80%"
-              :min="0.01"
-              :step="0.01"
-              :formatter="BaseTool.Amount.formatter"
-              :parser="BaseTool.Amount.parser"
-              v-decorator="['applyOil', {initialValue: oilModel.applyOil||0,rules: [{required: true, message: '申请油量不能为空'}]}]"/>
-            <span class="ant-input-group-addon" style="display: inline-block; width: 20%;height: 31px;line-height: 31px;margin-bottom: 6px;">升</span>
-          </a-form-item>
-        </row-item>
-
-      </row-list>
-      <row-list :col="1">
-        <row-item>
-          <a-form-item
-            label="申请说明"
-            :labelCol="BaseTool.Constant.labelCol2"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-textarea
-              :rows="4"
-              v-decorator="['applyRemark',{initialValue: oilModel.applyRemark}]"/>
-          </a-form-item>
-        </row-item>
-      </row-list>
-    </a-form>
-    <store-select-modal ref="storeSelectModal" @selected="handleStoreSelected"/>
-    <spare-store-page-modal ref="spareStorePageModal" :type="'radio'" @selected="handleSpareStoreSelected"/>
-  </div>
-</template>
-
-<script>
-import StoreSelectModal from '@/views/store/store/modules/StoreSelectModal'
-import SpareStorePageModal from '@/views/store/sparestore/modules/SpareStorePageModal'
-import pick from 'lodash.pick'
-
-export default {
-  name: 'FillForm',
-  components: {
-    StoreSelectModal,
-    SpareStorePageModal
-  },
-  data () {
-    return {
-      form: this.$form.createForm(this)
-    }
-  },
-  props: {
-    oilModel: {
-      type: Object,
-      default: () => {}
-    },
-    projectQuantityList: {
-      type: Array,
-      default: () => []
-    }
-  },
-  watch: {
-    oilModel (val) {
-      this.formSetModel()
-    }
-  },
-  created () {
-  },
-  methods: {
-    handleStoreSelected (record, keys, rows) {
-      const [ key ] = keys
-      const [ row ] = rows
-      const { form: { setFieldsValue } } = this
-      // 日期处理
-      this.$nextTick(() => {
-        setFieldsValue(Object.assign({
-          'storeId': key,
-          'storeName': row.name,
-          'spareName': null,
-          'spareStoreId': null
-        }))
-      })
-    },
-    handleSpareSelect () {
-      const { form: { getFieldValue } } = this
-      const storeId = getFieldValue('storeId')
-      if (this.BaseTool.String.isBlank(storeId)) {
-        this.$message.error('请先选择仓库')
-        return
-      }
-      this.$refs.spareStorePageModal.base({}, { storeId: storeId, num: 0, typeNameLike: '燃油' })
-    },
-    handleSpareStoreSelected (record, keys, rows) {
-      const [ row ] = rows
-      const { form: { setFieldsValue } } = this
-      // 日期处理
-      this.$nextTick(() => {
-        setFieldsValue(Object.assign({
-          'spareStoreId': row.id,
-          'spareName': row.spareName
-        }))
-      })
-    },
-    formSetModel () {
-      const { form: { setFieldsValue } } = this
-      this.$nextTick(() => {
-        setFieldsValue(Object.assign(pick(this.oilModel, [
-          'id',
-          'sbId',
-          'sbName',
-          'sbNo',
-          'sbCardNo',
-          'storeId',
-          'userId',
-          'userName',
-          'storeUserId',
-          'storeUserName',
-          'status',
-          'applyOil',
-          'realOil',
-          'projectQuantityId',
-          'spareName',
-          'spareStoreId',
-          'reason',
-          'applyRemark',
-          'handleRemark',
-          'remark'
-        ])))
-      })
-    }
-  }
-}
-</script>

+ 0 - 420
src/views/sb/oil/modules/SbOilPageBase.vue

@@ -1,420 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="关键字">
-              <a-input v-model="queryParam.keyword" placeholder="请输入设备编号/仓库名称/设备名称/卡片编号"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="仓库名称">
-              <a-input v-model="queryParam.storeName" placeholder="请输入仓库名称"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="设备型号">
-              <a-select
-                v-model="queryParam.modelId"
-                placeholder="请选择">
-                <a-select-option
-                  v-for="(item,index) in modelList"
-                  :key="index"
-                  :label="item.nameModel"
-                  :value="item.id">{{ item.nameModel }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="状态">
-              <a-select v-model="queryParam.status" placeholder="请选择">
-                <a-select-option
-                  v-for="(label,value) in statusMap"
-                  :key="value"
-                  :label="label"
-                  :value="parseInt(value)">{{ label }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator">
-      <a-button v-if="$auth('sb-oils-add')" type="primary" icon="plus" @click="$refs.baseModalList.base()">新增</a-button>
-      <a-popconfirm
-        style="margin-left: 8px"
-        v-if="$auth('sb-oils-confirm')"
-        title="是否要批量确认所选数据?"
-        @confirm="confirmList()">
-        <a-button icon="edit" type="primary">
-          批量确认
-        </a-button>
-      </a-popconfirm>
-      <a-button style="margin-left: 8px" v-if="$auth('sb-oils-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-oils-confirm')">
-        <a-menu slot="overlay">
-          <a-popconfirm title="是否要批量确认所选数据?" @confirm="confirmList()">
-            <a-menu-item key="1"><a-icon type="edit" /><a>批量确认</a></a-menu-item>
-          </a-popconfirm>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :bordered="this.MyGlobalConstant.BORDERED"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
-      <span slot="action" slot-scope="record">
-        <template>
-          <a @click="handleView(record)">查看</a>
-          <template v-if="record.status === DictCache.VALUE.SB_OIL_STATUS.OIL">
-            <operation-button
-              v-if="$auth('sb-oils-confirm')"
-              @click="handleConfirm(record)"
-            >确认</operation-button>
-          </template>
-          <template v-if="record.status === DictCache.VALUE.SB_OIL_STATUS.APPLY">
-            <operation-button
-              v-if="$auth('sb-oils-edit')"
-              @click="handleEdit(record)"
-            >修改</operation-button>
-            <operation-button
-              v-if="$auth('sb-oils-del')"
-              :type="2"
-              title="是否要删除该条数据?"
-              @confirm="batchDelete(record.id)">删除</operation-button>
-          </template>
-
-        </template>
-      </span>
-    </s-table>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <base-form-list :oil-filter="filter" ref="baseModalList" @ok="handleOk" />
-    <execute-base-form ref="executeBaseForm" @ok="handleOk" />
-    <audit-base-form ref="auditBaseForm" @ok="handleOk" />
-    <detail ref="detailModal"/>
-  </a-card>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './BaseForm'
-import BaseFormList from './BaseFormList'
-import Detail from './Detail'
-import ExecuteBaseForm from '@/views/sb/oil/modules/ExecuteBaseForm'
-import AuditBaseForm from '@/views/sb/oil/modules/AuditBaseForm'
-import { getSbOilPage, deleteSbOils, fetchSbOil, exportSbOil, updateConfirmSbOilList } from '@/api/sb/oil'
-import { querySbInfo } from '@/api/sb/model'
-
-export default {
-  name: 'SbOilList',
-  components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    BaseFormList,
-    ExecuteBaseForm,
-    AuditBaseForm,
-    Detail
-  },
-  props: {
-    filter: {
-      type: Number,
-      default: 1
-    }
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-      },
-      userInfo: this.$store.getters.userInfo,
-      modelList: [],
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备名称',
-          dataIndex: 'sbName'
-        },
-        {
-          title: '设备编号',
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '仓库名称',
-          dataIndex: 'storeName'
-        },
-        {
-          title: '申请人',
-          dataIndex: 'userName'
-        },
-        {
-          title: '申请油量',
-          dataIndex: 'applyOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '实际加油量',
-          dataIndex: 'realOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
-              this.DictCache.COLOR.SB_OIL_STATUS, this.statusMap)
-          }
-        },
-        {
-          title: '燃油类型',
-          dataIndex: 'spareName'
-        },
-        {
-          title: '工程项目',
-          dataIndex: 'projectQuantityName'
-        },
-        {
-          title: '用途',
-          dataIndex: 'reason'
-        },
-        {
-          title: '审批类型',
-          dataIndex: 'auditType',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.getMapText(this.auditTypeMap, text)
-          }
-        },
-        {
-          title: '仓库管理员',
-          dataIndex: 'storeUserName'
-        },
-        {
-          title: '申请说明',
-          dataIndex: 'applyRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '审批说明',
-          dataIndex: 'remark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '加油说明',
-          dataIndex: 'handleRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      statusMap: {},
-      auditTypeMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam,
-          filter: this.filter
-        }
-        return getSbOilPage(parameter)
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange,
-          getCheckboxProps: record => ({
-            props: {
-              disabled: record.status !== this.DictCache.VALUE.SB_OIL_STATUS.OIL,
-              name: record.id
-            }
-          })
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    this.initData()
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-    this.auditTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_AUDIT_TYPE)
-    this.tableOption()
-  },
-  methods: {
-    initData () {
-      querySbInfo({}).then(res => {
-        this.modelList = res.data
-      })
-    },
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: record.status !== this.DictCache.VALUE.SB_OIL_STATUS.OIL,
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    confirmList () {
-      const ids = this.selectedRows.map(item => item.id)
-      if (this.BaseTool.Object.isBlank(ids) || ids.length <= 0) {
-        this.$message.info('请选择要确认的记录')
-        return
-      }
-      updateConfirmSbOilList({ ids: ids }).then(res => {
-        this.handleOk()
-      })
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteSbOils(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleConfirm (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.executeBaseForm
-        modal.base(res.data)
-      })
-    },
-    auditHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.auditBaseForm
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.$refs.table.clearSelected()
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportSbOil(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleEnter () {
-      this.$refs.table.refresh(true)
-    }
-  }
-}
-</script>

+ 0 - 406
src/views/sb/oil/modules/SbOilPageTable.vue

@@ -1,406 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="关键字">
-              <a-input v-model="queryParam.keyword" placeholder="请输入设备编号/仓库名称/设备名称/卡片编号"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="仓库名称">
-              <a-input v-model="queryParam.storeName" placeholder="请输入仓库名称"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="设备型号">
-              <a-select
-                v-model="queryParam.modelId"
-                placeholder="请选择">
-                <a-select-option
-                  v-for="(item,index) in modelList"
-                  :key="index"
-                  :label="item.nameModel"
-                  :value="item.id">{{ item.nameModel }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="8" :sm="24">
-            <a-form-item label="状态">
-              <a-select v-model="queryParam.status" placeholder="请选择">
-                <a-select-option
-                  v-for="(label,value) in statusMap"
-                  :key="value"
-                  :label="label"
-                  :value="parseInt(value)">{{ label }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator">
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :bordered="this.MyGlobalConstant.BORDERED"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
-      <span slot="action" slot-scope="record">
-        <template>
-          <a @click="handleView(record)">查看</a>
-          <!--<template v-if="record.status === DictCache.VALUE.SB_OIL_STATUS.OIL">
-            <operation-button
-              v-if="$auth('sb-oils-confirm')"
-              @click="handleConfirm(record)"
-            >确认</operation-button>
-          </template>
-          <template v-if="record.status === DictCache.VALUE.SB_OIL_STATUS.APPLY">
-            <operation-button
-              v-if="$auth('sb-oils-edit')"
-              @click="handleEdit(record)"
-            >修改</operation-button>
-            <operation-button
-              v-if="$auth('sb-oils-del')"
-              :type="2"
-              title="是否要删除该条数据?"
-              @confirm="batchDelete(record.id)">删除</operation-button>
-          </template>-->
-
-        </template>
-      </span>
-    </s-table>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <base-form-list :oil-filter="filter" ref="baseModalList" @ok="handleOk" />
-    <execute-base-form ref="executeBaseForm" @ok="handleOk" />
-    <audit-base-form ref="auditBaseForm" @ok="handleOk" />
-    <detail ref="detailModal"/>
-  </a-card>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './BaseForm'
-import BaseFormList from './BaseFormList'
-import Detail from './Detail'
-import ExecuteBaseForm from '@/views/sb/oil/modules/ExecuteBaseForm'
-import AuditBaseForm from '@/views/sb/oil/modules/AuditBaseForm'
-import { getSbOilPage, deleteSbOils, fetchSbOil, exportSbOil, updateConfirmSbOilList } from '@/api/sb/oil'
-import { querySbInfo } from '@/api/sb/model'
-
-export default {
-  name: 'SbOilList',
-  components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    BaseFormList,
-    ExecuteBaseForm,
-    AuditBaseForm,
-    Detail
-  },
-  props: {
-    filter: {
-      type: Number,
-      default: 1
-    },
-    tableParams: {
-      type: Object,
-      default: () => ({})
-    },
-    modelParams: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  watch: {
-    tableParams: {
-      // deep: true, // 深度监听
-      handler (newVal, oldVal) {
-        if (newVal.sbId !== oldVal.sbId) {
-          this.handleOk()
-        }
-      }
-    }
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-      },
-      userInfo: this.$store.getters.userInfo,
-      modelList: [],
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备名称',
-          dataIndex: 'sbName'
-        },
-        {
-          title: '设备编号',
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '仓库名称',
-          dataIndex: 'storeName'
-        },
-        {
-          title: '申请人',
-          dataIndex: 'userName'
-        },
-        {
-          title: '申请油量',
-          dataIndex: 'applyOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '实际加油量',
-          dataIndex: 'realOil',
-          customRender: (text, record, index) => {
-            const result = this.BaseTool.Amount.formatter(text)
-            if (this.BaseTool.String.isNotBlank(result)) {
-              return result + '升'
-            } else {
-              return ''
-            }
-          }
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
-              this.DictCache.COLOR.SB_OIL_STATUS, this.statusMap)
-          }
-        },
-        {
-          title: '审批类型',
-          dataIndex: 'auditType',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.getMapText(this.auditTypeMap, text)
-          }
-        },
-        {
-          title: '仓库管理员',
-          dataIndex: 'storeUserName'
-        },
-        {
-          title: '申请说明',
-          dataIndex: 'applyRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '审批说明',
-          dataIndex: 'remark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '加油说明',
-          dataIndex: 'handleRemark',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.customRenderWidth(this, text, '150px')
-          }
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      statusMap: {},
-      auditTypeMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.tableParams,
-          ...this.queryParam,
-          filter: this.filter
-        }
-        return getSbOilPage(parameter)
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange,
-          getCheckboxProps: record => ({
-            props: {
-              disabled: record.status !== this.DictCache.VALUE.SB_OIL_STATUS.OIL,
-              name: record.id
-            }
-          })
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    this.initData()
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-    this.auditTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_AUDIT_TYPE)
-    this.tableOption()
-  },
-  methods: {
-    initData () {
-      querySbInfo({}).then(res => {
-        this.modelList = res.data
-      })
-    },
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: record.status !== this.DictCache.VALUE.SB_OIL_STATUS.OIL,
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    confirmList () {
-      const ids = this.selectedRows.map(item => item.id)
-      if (this.BaseTool.Object.isBlank(ids) || ids.length <= 0) {
-        this.$message.info('请选择要确认的记录')
-        return
-      }
-      updateConfirmSbOilList({ ids: ids }).then(res => {
-        this.handleOk()
-      })
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteSbOils(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleConfirm (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.executeBaseForm
-        modal.base(res.data)
-      })
-    },
-    auditHandle (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.auditBaseForm
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.$refs.table.clearSelected()
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportSbOil(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleEnter () {
-      this.$refs.table.refresh(true)
-    }
-  }
-}
-</script>

+ 0 - 311
src/views/sb/oil/modules/SbOilSelectModal.vue

@@ -1,311 +0,0 @@
-<template>
-  <a-modal
-    :title="modalTitle"
-    :width="1000"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    class="ant-modal2"
-    @cancel="handleCancel"
-  >
-    <a-card :bordered="false">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="关键字">
-                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8 || 24" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              </span>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-
-      <div class="table-operator">
-      </div>
-
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :alert="options.alert"
-        :customRow="options.customRow"
-        :rowSelection="options.rowSelection"
-        showPagination="auto"
-      >
-        <span slot="action" slot-scope="record">
-          <template>
-            <a @click="handleView(record)">查看</a>
-          </template>
-        </span>
-      </s-table>
-      <detail ref="detailModal"/>
-    </a-card>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">取消</a-button>
-      <a-button :loading="confirmLoading" type="primary" @click="handleSelect()">确定</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import Detail from './Detail'
-import { getSbOilPage, fetchSbOil } from '@/api/sb/oil'
-
-export default {
-  name: 'SbOilSelectModal',
-  components: {
-    STable,
-    Ellipsis,
-    Detail
-  },
-  props: {
-    type: {
-      type: String,
-      default: 'radio'
-    }
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      mdl: {},
-      modalTitle: null,
-      visible: false,
-      extraModel: {},
-      // 查询参数
-      queryParam: {
-      },
-      extraQueryParam: {
-      },
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备ID',
-          dataIndex: 'sbId'
-        },
-        {
-          title: '仓库ID',
-          dataIndex: 'storeId'
-        },
-        {
-          title: '申请人',
-          dataIndex: 'userId'
-        },
-        {
-          title: '申请人名称',
-          dataIndex: 'userName'
-        },
-        {
-          title: '处理人',
-          dataIndex: 'storeUserId'
-        },
-        {
-          title: '处理人名称',
-          dataIndex: 'storeUserName'
-        },
-        {
-          title: '状态:1.申请中,2.已处理,3.撤销',
-          dataIndex: 'status',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.statusMap, text)
-          }
-        },
-        {
-          title: '申请油量',
-          dataIndex: 'applyOil',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
-        },
-        {
-          title: '实际加油量',
-          dataIndex: 'realOil',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
-        },
-        {
-          title: '申请说明',
-          dataIndex: 'applyRemark'
-        },
-        {
-          title: '执行说明',
-          dataIndex: 'handleRemark'
-        },
-        {
-          title: '说明',
-          dataIndex: 'remark'
-        },
-        {
-          title: '创建人名称',
-          dataIndex: 'createdUserName'
-        },
-        {
-          title: '创建日期',
-          dataIndex: 'createdTime'
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      statusMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam,
-          ...this.extraQueryParam,
-          dataScope: {
-            sortBy: 'desc',
-            sortName: 'update_time'
-          }
-        }
-        return getSbOilPage(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false,
-      isCreated: false
-    }
-  },
-  created () {
-    // 下拉框map
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_OIL_STATUS)
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            type: this.type,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: false,
-                name: record.id
-              }
-            })
-          },
-          customRow: (record) => {
-            return {
-              on: { // 事件
-                click: (event) => { // 点击行
-                  // 选择对象
-                  this.mySelect([record.id], [record])
-                },
-                dblclick: (event) => {
-                  this.mySelect([record.id], [record])
-                  this.handleSelect()
-                }
-              }
-            }
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    handleView (record) {
-      fetchSbOil({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    base (extraModel, queryParam = {}) {
-      this.visible = true
-      this.modalTitle = '选择信息'
-      this.extraQueryParam = queryParam
-      this.extraModel = extraModel
-      if (this.isCreated) {
-        this.$refs.table.clearSelected()
-        this.options.rowSelection.type = this.type
-        this.handleOk()
-      } else {
-        this.tableOption()
-        this.isCreated = true
-      }
-    },
-    handleCancel () {
-      this.visible = false
-      this.confirmLoading = false
-    },
-    handleSelect () {
-      if (this.selectedRowKeys.length === 0) {
-        this.$message.warn('请至少选择一项信息')
-      } else {
-        this.confirmLoading = true
-        this.$emit('selected', this.extraModel, this.selectedRowKeys, this.selectedRows)
-        this.confirmLoading = false
-        this.visible = false
-      }
-    },
-    mySelect (selectedRowKeys, selectedRows) {
-      if (this.type === 'radio') {
-        this.$refs.table.updateSelect(selectedRowKeys, selectedRows)
-        this.$refs.table.rowSelection.onChange(selectedRowKeys, selectedRows)
-      } else {
-        let mySelectedRowKeys
-        let mySelectedRows = this.selectedRows.filter(item => item.id !== selectedRowKeys[0])
-        if (this.selectedRowKeys.includes(selectedRowKeys[0])) {
-          mySelectedRowKeys = this.selectedRowKeys.filter(item => item !== selectedRowKeys[0])
-        } else {
-          mySelectedRowKeys = [...selectedRowKeys, ...this.selectedRowKeys]
-          mySelectedRows = [...mySelectedRows, ...selectedRows]
-        }
-        this.$refs.table.updateSelect(mySelectedRowKeys, mySelectedRows)
-        this.$refs.table.rowSelection.onChange(mySelectedRowKeys, mySelectedRows)
-      }
-    }
-  }
-}
-</script>

+ 0 - 2
src/views/sb/scrap/modules/Detail.vue

@@ -92,7 +92,6 @@ import { fetchSbInfo, updateSbInfoScrapForAudit } from '@/api/sb/info'
 import RepairApplicationFormTable from '@/views/repair/application-form/modules/RepairApplicationFormTable'
 import CheckJobTable from '@/views/check/checkjob/modules/CheckJobTable'
 import SparePartUsedSelectTable from '@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable'
-import SbOilPageTable from '@/views/sb/oil/modules/SbOilPageTable'
 import SbRunFillPageTable from '@/views/sb/run-fill/modules/SbRunFillPageTable'
 import SbInspectionFillPageTable from '@/views/sb/inspection-fill/modules/SbInspectionFillPageTable'
 import PrintInForm from '@/views/sb/scrap/modules/PrintInForm'
@@ -109,7 +108,6 @@ export default {
     RepairApplicationFormTable,
     CheckJobTable,
     SparePartUsedSelectTable,
-    SbOilPageTable,
     SbRunFillPageTable,
     SbInspectionFillPageTable,
     PrintInForm

+ 0 - 2
src/views/sb/scrap/modules/DetailAuditScrap.vue

@@ -88,7 +88,6 @@ import { fetchSbInfo, auditProcess, updateSbInfoScrapForAudit } from '@/api/sb/i
 import RepairApplicationFormTable from '@/views/repair/application-form/modules/RepairApplicationFormTable'
 import CheckJobTable from '@/views/check/checkjob/modules/CheckJobTable'
 import SparePartUsedSelectTable from '@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable'
-import SbOilPageTable from '@/views/sb/oil/modules/SbOilPageTable'
 import SbRunFillPageTable from '@/views/sb/run-fill/modules/SbRunFillPageTable'
 import SbInspectionFillPageTable from '@/views/sb/inspection-fill/modules/SbInspectionFillPageTable'
 import PrintInForm from '@/views/sb/scrap/modules/PrintInForm'
@@ -104,7 +103,6 @@ export default {
     RepairApplicationFormTable,
     CheckJobTable,
     SparePartUsedSelectTable,
-    SbOilPageTable,
     SbRunFillPageTable,
     SbInspectionFillPageTable,
     PrintInForm

+ 0 - 445
src/views/test/BaseFormBak.vue

@@ -1,445 +0,0 @@
-<template>
-  <a-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
-    <h1 style="margin:20px auto; text-align: center"> 质量数据录入界面 </h1>
-    <title-divider title="样品" width="90px"></title-divider>
-    <a-form :form="form">
-      <a-form-item v-show="false" >
-        <a-input v-decorator="['id']" type="hidden"/>
-      </a-form-item>
-      <a-row :gutter="24">
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="样品信息"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param1', {rules: [{required: false, message: '样品信息不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="订单号"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param2']" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="检测车间"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['param3']" placeholder="请选择">
-              <a-select-option value="一号车间">
-                一号车间
-              </a-select-option>
-              <a-select-option value="二号车间">
-                二号车间
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="送样时间"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-date-picker
-              style="width: 100%"
-              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-              v-decorator="['param4']" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="工段名称"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param5']"
-              suffix="%" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="水分/ppm"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param6']"
-              suffix="%" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="固含量"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              style="width:70%"
-              v-decorator="['param7', {rules: [{required: false, message: '不能为空'}]}]" />
-            <a-button type="primary" style="width:30%" @click="showModel">选择公式</a-button>
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="pH"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              style="width:70%"
-              v-decorator="['param8', {rules: [{required: false, message: '不能为空'}]}]" />
-            <a-button type="primary" style="width:30%" @click="showModel">选择公式</a-button>
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="密度"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              suffix="g/cm"
-              v-decorator="['param9', {rules: [{required: false, message: '不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="HF"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              suffix="ug/g"
-              v-decorator="['param10', {rules: [{required: false, message: '不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="色度"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param11', {rules: [{required: false, message: '不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="LIFSI"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param12', {rules: [{required: false, message: '不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="F-160C"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param13', {rules: [{required: false, message: '不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="GS-907"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param14', {rules: [{required: false, message: '不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="GS-908"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param15', {rules: [{required: false, message: '不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="GS-905"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['param16', {rules: [{required: false, message: '不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-    <title-divider title="检测记录" width="90px"></title-divider>
-    <div class="table-operator">
-    </div>
-    <a-table
-      bordered
-      :data-source="data"
-      :columns="columns"
-      tableLayout="auto"
-      :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
-      rowKey="id"
-      :row-selection="rowSelection">
-      <span slot="action" slot-scope="record">
-        <template>
-          <a @click="handleEdit(record)">修改</a>
-          <a-divider type="vertical" />
-          <a-popconfirm title="是否要删除该条数据?" @confirm="handleDelOne(record.id)">
-            <a>删除</a>
-          </a-popconfirm>
-        </template>
-      </span>
-    </a-table>
-    <a-row :gutter="48">
-      <a-col :md="48" :sm="48">
-        <span class="table-page-search-submitButtons" style="float: right;margin-top: 10px">
-          <a-button type="primary" @click="save()">提交</a-button>
-          <a-button style="margin-left: 8px" @click="handleCancel()">返回</a-button>
-        </span>
-      </a-col>
-    </a-row>
-  </a-card>
-</template>
-
-<script>
-import pick from 'lodash.pick'
-
-export default {
-  name: 'BaseInStoreForm',
-  components: {
-  },
-  data () {
-    return {
-      confirmLoading: false,
-      modalTitle: null,
-      form: this.$form.createForm(this),
-      visible: true,
-      maskClosable: false,
-      storeId: null,
-      typeMap: {},
-      userList: {},
-      rowSelection: {
-        onChange: (selectedRowKeys, selectedRows) => {
-          this.selectedRowKeys = selectedRowKeys
-          this.selectedRows = selectedRows
-        }
-      },
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          width: 180,
-          dataIndex: 'id'
-        },
-        {
-          title: '样品信息',
-          width: 120,
-          dataIndex: 'param1'
-        },
-        {
-          title: '订单号',
-          width: 120,
-          dataIndex: 'param2'
-        },
-        {
-          title: '检测车间',
-          width: 120,
-          dataIndex: 'param3'
-        },
-        {
-          title: '送样时间',
-          width: 120,
-          dataIndex: 'param4'
-        },
-        {
-          title: '工段名称',
-          dataIndex: 'param5',
-          width: 120,
-          scopedSlots: { customRender: 'num' }
-        },
-        {
-          title: '水分/ppm',
-          dataIndex: 'param6',
-          width: 150,
-          scopedSlots: { customRender: 'price' }
-        },
-        {
-          title: '固含量',
-          dataIndex: 'param7',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: 'pH',
-          dataIndex: 'param8',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: '密度',
-          dataIndex: 'param9',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: 'HF',
-          dataIndex: 'param10',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: '色度',
-          dataIndex: 'param11',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: 'LIFSI',
-          dataIndex: 'param12',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: 'F-160C',
-          dataIndex: 'param13',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: 'GS-907',
-          dataIndex: 'param14',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: 'GS-908',
-          dataIndex: 'param15',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: 'GS-905',
-          dataIndex: 'param16',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: 120,
-          fixed: 'right',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      data: [],
-      index: 1,
-      user: this.$store.getters.userInfo,
-      selectedRowKeys: [],
-      selectedRows: [],
-      options: {
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys
-        }
-      }
-    }
-  },
-  props: {
-  },
-  created () {
-    // 下拉框map
-    this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.IN_STORE_FORM_TYPE)
-    this.data = JSON.parse(localStorage.getItem('test'))
-    if (this.data != null) {
-      this.index = this.data.length + 1
-    } else {
-      this.data = []
-    }
-  },
-  methods: {
-    base (record) {
-      this.visible = true
-      // 如果是空标识添加
-      if (this.BaseTool.Object.isBlank(record)) {
-        this.modalTitle = '添加'
-        this.data = []
-      }
-    },
-    save () {
-      const { form: { validateFieldsAndScroll } } = this
-      this.confirmLoading = true
-      validateFieldsAndScroll((errors, values) => {
-        if (errors) {
-          this.confirmLoading = false
-          return
-        }
-        if (values.id == null) {
-          var str = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-          var result = ''
-          var length = 16
-          for (var i = length; i > 0; --i) { result += str[Math.floor(Math.random() * str.length)] }
-          values.id = result
-          values.param4 = this.BaseTool.Date.formatter(values.param4, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
-          this.data.push(values)
-          this.$message.info('新增成功')
-          this.confirmLoading = false
-        } else {
-          const data = [...this.data]
-          this.data = data.filter(item => values.id !== item.id)
-          var str = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-          var result = ''
-          var length = 16
-          for (var i = length; i > 0; --i) { result += str[Math.floor(Math.random() * str.length)] }
-          values.id = result
-          this.data.push(values)
-          this.$message.info('更新成功')
-        }
-        localStorage.setItem('test', JSON.stringify(this.data))
-        this.form.resetFields()
-      })
-    },
-    handleCancel (values) {
-      this.visible = false
-      this.confirmLoading = false
-      this.form.resetFields()
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok', values)
-      } else {
-        this.$emit('ok')
-      }
-    },
-    handleEdit (record) {
-      record.param4 = this.BaseTool.Date.formatter(record.param4, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
-      const { form: { setFieldsValue } } = this
-      // 日期处理
-      this.$nextTick(() => {
-        setFieldsValue(record)
-      })
-    },
-    handleDelOne (id) {
-      const data = [...this.data]
-      this.data = data.filter(item => id !== item.id)
-      localStorage.setItem('test', JSON.stringify(this.data))
-    },
-    showModel () {
-      this.$message.info('后期如果配置了公式,这里则可以选择计算公示,自动计算。')
-    }
-  }
-}
-</script>

+ 0 - 235
src/views/ticket/ticket/Ticket.vue

@@ -1,235 +0,0 @@
-<template>
-    <a-card :bordered="false">
-        <div class="table-page-search-wrapper"  @keyup.enter="handleEnter">
-            <a-form layout="inline">
-                <a-row :gutter="48">
-                    <a-col :md="8" :sm="24">
-                        <a-form-item label="关键字">
-                            <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-                    </a-col>
-                </a-row>
-            </a-form>
-        </div>
-
-        <div class="table-operator">
-            <a-button v-if="$auth('ticket-ticket-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('ticket-ticket-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-            <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('ticket-ticket-del')">
-                <a-menu slot="overlay">
-                    <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
-                        <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-                    </a-popconfirm>
-                </a-menu>
-                <a-button style="margin-left: 8px">
-                    批量操作 <a-icon type="down" />
-                </a-button>
-            </a-dropdown>
-        </div>
-
-        <s-table
-                ref="table"
-                size="default"
-                rowKey="id"
-                :bordered="this.MyGlobalConstant.BORDERED"
-                :columns="columns"
-                :data="loadData"
-                :alert="options.alert"
-                :rowSelection="options.rowSelection"
-                showPagination="auto"
-        >
-            <span slot="action" slot-scope="record">
-              <template>
-                <a @click="handleView(record)">查看</a>
-                <operation-button
-                        v-if="$auth('ticket-ticket-edit')" @click="handleEdit(record)"
-                      >修改</operation-button>
-                <operation-button
-                        v-if="$auth('ticket-ticket-del')"
-                        :type="2"
-                        title="是否要删除该条数据?"
-                        @confirm="batchDelete(record.id)">删除</operation-button>
-              </template>
-            </span>
-        </s-table>
-        <base-form ref="baseModal" @ok="handleOk"/>
-        <detail ref="detailModal"/>
-    </a-card>
-</template>
-
-<script>
-    import { STable, Ellipsis } from '@/components'
-    import BaseForm from './modules/BaseForm'
-    import Detail from './modules/Detail'
-    import { getTicketPage, deleteTickets, fetchTicket, exportTicket } from '@/api/ticket/ticket'
-
-    export default {
-        name: 'TicketList',
-        components: {
-            STable,
-            Ellipsis,
-            BaseForm,
-            Detail
-        },
-        data () {
-            return {
-                // 查询参数
-                queryParam: {
-                },
-                // 表头
-                columns: [
-                    {
-                        title: '序号',
-                        dataIndex: 'index',
-                        customRender: (text, record, index) => {
-                            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-                        }
-                    },
-                                                                                                                                                {
-                                title: '编号',
-                                dataIndex: 'no'
-                            },
-                                                                                                                                                        {
-                                title: '工作票类别',
-                                dataIndex: 'type'
-                            },
-                                                                                                                                                        {
-                                title: '工作任务',
-                                dataIndex: 'content'
-                            },
-                                                                                                                                                        {
-                                title: '状态0:已废弃1:启用中',
-                                dataIndex: 'status'
-                            },
-                                                                                                                                                        {
-                                title: '备注',
-                                dataIndex: 'remark'
-                            },
-                                                                                                                                                                                                    {
-                                title: '创建日期',
-                                dataIndex: 'createdTime'
-                            },
-                                                                                                                                        {
-                        title: '操作',
-                        key: 'action',
-                        width: '200px',
-                        align: 'center',
-                        scopedSlots: { customRender: 'action' }
-                    }
-                ],
-                // 下拉框map
-                                // 加载数据方法 必须为 Promise 对象
-                loadData: parameter => {
-                    parameter = {
-                        ...parameter,
-                        ...this.queryParam
-                    }
-                    return getTicketPage(parameter)
-                            .then(res => {
-                                return res.data
-                            })
-                },
-                selectedRowKeys: [],
-                selectedRows: [],
-
-                options: {
-                    alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                    rowSelection: {
-                        selectedRowKeys: this.selectedRowKeys,
-                        onChange: this.onSelectChange
-                    }
-                },
-                optionAlertShow: false
-            }
-        },
-        created () {
-            // 下拉框map
-                        this.tableOption()
-        },
-        methods: {
-            tableOption () {
-                if (!this.optionAlertShow) {
-                    this.options = {
-                        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                        rowSelection: {
-                            selectedRowKeys: this.selectedRowKeys,
-                            onChange: this.onSelectChange,
-                            getCheckboxProps: record => ({
-                                props: {
-                                    disabled: false,
-                                    name: record.id
-                                }
-                            })
-                        }
-                    }
-                    this.optionAlertShow = true
-                } else {
-                    this.options = {
-                        alert: false,
-                        rowSelection: null
-                    }
-                    this.optionAlertShow = false
-                }
-            },
-            batchDelete (id) {
-                let ids = []
-                if (this.BaseTool.String.isBlank(id)) {
-                    const length = this.selectedRows.length
-                    if (length === 0) {
-                        this.$message.info('请选择要删除的记录')
-                                return
-                    }
-                    ids = this.selectedRows.map(item => item.id)
-                } else {
-                    ids = [id]
-                }
-                deleteTickets(ids).then(res => {
-                    this.$message.info('删除成功')
-                    this.handleOk()
-                    this.$refs.table.clearSelected()
-                })
-            },
-            handleEdit (record) {
-                fetchTicket({ id: record.id }).then(res => {
-                    const modal = this.$refs.baseModal
-                    modal.base(res.data)
-                })
-            },
-            handleView (record) {
-                fetchTicket({ id: record.id }).then(res => {
-                    const modal = this.$refs.detailModal
-                    modal.base(res.data)
-                })
-            },
-            handleOk () {
-                this.$refs.table.refresh()
-            },
-            onSelectChange (selectedRowKeys, selectedRows) {
-                this.selectedRowKeys = selectedRowKeys
-                this.selectedRows = selectedRows
-            },
-            resetSearchForm () {
-                this.queryParam = {
-                }
-                this.$refs.table.refresh(true)
-            },
-            doExport () {
-                const parameter = {
-                    ...this.queryParam
-                }
-                exportTicket(parameter).then(file => {
-                    this.BaseTool.UPLOAD.downLoadExportExcel(file)
-                })
-            },
-            handleEnter () {
-                this.$refs.table.refresh(true)
-            }
-        }
-    }
-</script>

+ 0 - 152
src/views/ticket/ticket/modules/BaseForm.vue

@@ -1,152 +0,0 @@
-<template>
-    <a-modal
-            :title="modalTitle"
-            :width="800"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-                    @cancel="handleCancel"
-    >
-        <a-form :form="form">
-            <row-list :col="1" v-show="false">
-                <row-item>
-                    <a-form-item>
-                        <a-input v-decorator="['id']" type="hidden"/>
-                    </a-form-item>
-                </row-item>
-            </row-list>
-                            <row-list :col="1">
-                                                                                                                    <row-item>
-                                <a-form-item
-                                        label="编号"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['no', {rules: [{required: true, message: '编号不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="工作票类别"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['type', {rules: [{required: true, message: '工作票类别不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="工作任务"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['content', {rules: [{required: true, message: '工作任务不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="状态0:已废弃1:启用中"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="备注"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['remark', {rules: [{required: true, message: '备注不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                                                                                                                </row-list>
-                    </a-form>
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import pick from 'lodash.pick'
-    import {addTicket, updateTicket } from '@/api/ticket/ticket'
-
-    export default {
-        name: 'BaseTicket',
-        data() {
-            return {
-                confirmLoading: false,
-                modalTitle: null,
-                form: this.$form.createForm(this),
-                visible: false,
-            // 下拉框map
-                    }
-        },
-        props: {},
-        created() {
-            // 下拉框map
-                    },
-        methods: {
-            base(record) {
-                this.visible = true
-                // 如果是空标识添加
-                if (this.BaseTool.Object.isBlank(record)) {
-                    this.modalTitle = '添加'
-                    return
-                }
-                this.modalTitle = '编辑'
-                const {form: {setFieldsValue}} = this
-                // 日期处理
-                                this.$nextTick(() => {
-                    setFieldsValue(Object.assign(pick(record, [
-                                                                                    'id',
-                                                                                                                'no',
-                                                                                                                'type',
-                                                                                                                'content',
-                                                                                                                'status',
-                                                                                                                'remark',
-                                                                                                                                                                                                                ])))
-                })
-            },
-            save() {
-                const {form: {validateFieldsAndScroll}} = this
-                this.confirmLoading = true
-                validateFieldsAndScroll((errors, values) => {
-                    if (errors) {
-                        this.confirmLoading = false
-                        return
-                    }
-                    // 日期处理
-                                        if (this.BaseTool.String.isBlank(values.id)) {
-                        addTicket(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    } else {
-                        updateTicket(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    }
-                })
-            },
-            handleCancel(values) {
-                this.visible = false
-                this.confirmLoading = false
-                this.form.resetFields()
-                if (this.BaseTool.Object.isNotBlank(values)) {
-                    this.$emit('ok', values)
-                }
-            }
-
-        }
-    }
-</script>

+ 0 - 69
src/views/ticket/ticket/modules/Detail.vue

@@ -1,69 +0,0 @@
-<template>
-    <a-modal
-        :title="modalTitle"
-        :width="850"
-        :visible="visible"
-        :confirmLoading="confirmLoading"
-                @cancel="handleCancel"
-    >
-        <detail-list title="" :col="2">
-                                                                                                    <detail-list-item term="编号">{{ model.no }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作票类别">{{ model.type }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作任务">{{ model.content }}</detail-list-item>
-                                                                                                            <detail-list-item term="状态0:已废弃1:启用中">{{ model.status }}</detail-list-item>
-                                                                                                            <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-                                                                                                            <detail-list-item term="创建人">{{ model.createdUserId }}</detail-list-item>
-                                                                                                                                        <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-                                                        </detail-list>
-
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import DetailList from '@/components/tools/DetailList'
-    const DetailListItem = DetailList.Item
-
-    export default {
-        name: 'TicketDetail',
-        components: {
-            DetailList,
-            DetailListItem
-        },
-        data () {
-            return {
-                confirmLoading: false,
-                mdl: {},
-                modalTitle: null,
-                visible: false,
-                // 下拉框map
-                                model: {
-                                                                                                                    'no': null,
-                                                                                                'type': null,
-                                                                                                'content': null,
-                                                                                                'status': null,
-                                                                                                'remark': null,
-                                                                                                'createdUserId': null,
-                                                                                                                                            'updateTime': null,
-                                                            }
-            }
-        },
-        created () {
-            // 下拉框map
-                    },
-        methods: {
-            base (record) {
-                this.visible = true
-                this.modalTitle = '详情'
-                this.model = record
-            },
-            handleCancel () {
-                this.visible = false
-                this.confirmLoading = false
-            }
-
-        }
-    }
-</script>

+ 0 - 281
src/views/ticket/ticket/modules/TicketSelectModal.vue

@@ -1,281 +0,0 @@
-<template>
-    <a-modal
-            :title="modalTitle"
-            :width="1000"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-            class="ant-modal2"
-            @cancel="handleCancel"
-    >
-        <a-card :bordered="false">
-            <div class="table-page-search-wrapper">
-                <a-form layout="inline">
-                    <a-row :gutter="48">
-                        <a-col :md="8" :sm="24">
-                            <a-form-item label="关键字">
-                                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :md="8 || 24" :sm="24">
-                <span class="table-page-search-submitButtons">
-                  <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-                </span>
-                        </a-col>
-                    </a-row>
-                </a-form>
-            </div>
-
-            <div class="table-operator">
-            </div>
-
-            <s-table
-                    ref="table"
-                    size="default"
-                    rowKey="id"
-                    :columns="columns"
-                    :data="loadData"
-                    :alert="options.alert"
-                    :customRow="options.customRow"
-                    :rowSelection="options.rowSelection"
-                    showPagination="auto"
-            >
-                <span slot="action" slot-scope="record1">
-                  <template>
-                    <a @click="handleView(record1)">查看</a>
-                  </template>
-                </span>
-            </s-table>
-            <detail ref="detailModal"/>
-        </a-card>
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">取消</a-button>
-            <a-button :loading="confirmLoading" type="primary" @click="handleSelect()">确定</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import { STable, Ellipsis } from '@/components'
-    import Detail from './Detail'
-    import { getTicketPage, fetchTicket } from '@/api/ticket/ticket'
-
-    export default {
-        name: 'TicketSelectModal',
-        components: {
-            STable,
-            Ellipsis,
-            Detail
-        },
-        props: {
-            type: {
-                type: String,
-                default: 'radio'
-            },
-            selectedRowKey: {
-                type: Array,
-                default: () => {
-                    return []
-                }
-            },
-            selectedRow: {
-                type: Array,
-                default: () => {
-                    return []
-                }
-            }
-        },
-        data () {
-            return {
-                confirmLoading: false,
-                mdl: {},
-                modalTitle: null,
-                visible: false,
-                record: null,
-                // 查询参数
-                queryParam: {
-                },
-                extraQueryParam: {
-                },
-                // 表头
-                columns: [
-                    {
-                        title: '序号',
-                        dataIndex: 'index',
-                        customRender: (text, record, index) => {
-                            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-                        }
-                    },
-                                                                                                                                                {
-                                title: '编号',
-                                dataIndex: 'no'
-                            },
-                                                                                                                                                        {
-                                title: '工作票类别',
-                                dataIndex: 'type'
-                            },
-                                                                                                                                                        {
-                                title: '工作任务',
-                                dataIndex: 'content'
-                            },
-                                                                                                                                                        {
-                                title: '状态0:已废弃1:启用中',
-                                dataIndex: 'status'
-                            },
-                                                                                                                                                        {
-                                title: '备注',
-                                dataIndex: 'remark'
-                            },
-                                                                                                                                                                                                    {
-                                title: '创建日期',
-                                dataIndex: 'createdTime'
-                            },
-                                                                                                                                        {
-                        title: '操作',
-                        key: 'action',
-                        width: '200px',
-                        align: 'center',
-                        scopedSlots: { customRender: 'action' }
-                    }
-                ],
-                // 下拉框map
-                                // 加载数据方法 必须为 Promise 对象
-                loadData: parameter => {
-                    parameter = {
-                        ...parameter,
-                        ...this.queryParam,
-                        ...this.extraQueryParam,
-                        dataScope: {
-                            sortBy: 'desc',
-                            sortName: 'update_time'
-                        }
-                    }
-                    return getTicketPage(Object.assign(parameter, this.queryParam))
-                            .then(res => {
-                                return res.data
-                            })
-                },
-                selectedRowKeys: [],
-                selectedRows: [],
-
-                options: {
-                    alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                    rowSelection: {
-                        selectedRowKeys: this.selectedRowKeys,
-                        onChange: this.onSelectChange
-                    }
-                },
-                optionAlertShow: false,
-                isCreated: false
-            }
-        },
-        created () {
-            // 下拉框map
-                    },
-        methods: {
-            tableOption () {
-                if (!this.optionAlertShow) {
-                    this.options = {
-                        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                        rowSelection: {
-                            selectedRowKeys: this.selectedRowKeys,
-                            onChange: this.onSelectChange,
-                            type: this.type,
-                            getCheckboxProps: record => ({
-                                props: {
-                                    disabled: false,
-                                    name: record.id
-                                }
-                            })
-                        },
-                        customRow: (record) => {
-                            return {
-                                on: { // 事件
-                                    click: (event) => { // 点击行
-                                        // 选择对象
-                                        this.mySelect([record.id], [record])
-                                    },
-                                    dblclick: (event) => {
-                                        this.mySelect([record.id], [record])
-                                        this.handleSelect()
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    this.optionAlertShow = true
-                } else {
-                    this.options = {
-                        alert: false,
-                        rowSelection: null
-                    }
-                    this.optionAlertShow = false
-                }
-            },
-            handleView (record) {
-                fetchTicket({ id: record.id }).then(res => {
-                    const modal = this.$refs.detailModal
-                    modal.base(res.data)
-                })
-            },
-            handleOk () {
-                this.$refs.table.refresh()
-            },
-            onSelectChange (selectedRowKeys, selectedRows) {
-                this.selectedRowKeys = selectedRowKeys
-                this.selectedRows = selectedRows
-            },
-            resetSearchForm () {
-                this.queryParam = {
-                }
-                this.$refs.table.refresh(true)
-            },
-            base (record, queryParam = {}) {
-                this.visible = true
-                this.modalTitle = '选择信息'
-                this.extraQueryParam = queryParam
-                this.record = record
-                if (this.isCreated) {
-                    this.$refs.table.clearSelected()
-                    this.options.rowSelection.type = this.type
-                    this.handleOk()
-                } else {
-                    this.tableOption()
-                    this.isCreated = true
-                }
-            },
-            handleCancel () {
-                this.visible = false
-                this.confirmLoading = false
-            },
-            handleSelect () {
-                if (this.selectedRowKeys.length === 0) {
-                    this.$message.warn('请至少选择一项信息')
-                } else {
-                    this.confirmLoading = true
-                    this.$emit('selected', this.record, this.selectedRowKeys, this.selectedRows)
-                    this.confirmLoading = false
-                    this.visible = false
-                }
-            },
-            mySelect(selectedRowKeys, selectedRows) {
-                if (this.type === 'radio') {
-                    this.$refs.table.updateSelect(selectedRowKeys, selectedRows)
-                            this.$refs.table.rowSelection.onChange(selectedRowKeys, selectedRows)
-                } else {
-                    let mySelectedRowKeys
-                    let mySelectedRows = this.selectedRows.filter(item => item.id !== selectedRowKeys[0])
-                    if (this.selectedRowKeys.includes(selectedRowKeys[0])) {
-                        mySelectedRowKeys = this.selectedRowKeys.filter(item => item !== selectedRowKeys[0])
-                    } else {
-                        mySelectedRowKeys = [...selectedRowKeys, ...this.selectedRowKeys]
-                        mySelectedRows = [...mySelectedRows, ...selectedRows]
-                    }
-                    this.$refs.table.updateSelect(mySelectedRowKeys, mySelectedRows)
-                            this.$refs.table.rowSelection.onChange(mySelectedRowKeys, mySelectedRows)
-                }
-
-            }
-        }
-    }
-</script>

+ 0 - 363
src/views/ticket/ticketexecute/TicketExecute.vue

@@ -1,363 +0,0 @@
-<template>
-    <a-card :bordered="false">
-        <div class="table-page-search-wrapper"  @keyup.enter="handleEnter">
-            <a-form layout="inline">
-                <a-row :gutter="48">
-                    <a-col :md="8" :sm="24">
-                        <a-form-item label="关键字">
-                            <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-                    </a-col>
-                </a-row>
-            </a-form>
-        </div>
-
-        <div class="table-operator">
-            <a-button v-if="$auth('ticket-ticket-executes-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('ticket-ticket-executes-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-            <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('ticket-ticket-executes-del')">
-                <a-menu slot="overlay">
-                    <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
-                        <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-                    </a-popconfirm>
-                </a-menu>
-                <a-button style="margin-left: 8px">
-                    批量操作 <a-icon type="down" />
-                </a-button>
-            </a-dropdown>
-        </div>
-
-        <s-table
-                ref="table"
-                size="default"
-                rowKey="id"
-                :bordered="this.MyGlobalConstant.BORDERED"
-                :columns="columns"
-                :data="loadData"
-                :alert="options.alert"
-                :rowSelection="options.rowSelection"
-                showPagination="auto"
-        >
-            <span slot="action" slot-scope="record">
-              <template>
-                <a @click="handleView(record)">查看</a>
-                <operation-button
-                        v-if="$auth('ticket-ticket-executes-edit')" @click="handleEdit(record)"
-                      >修改</operation-button>
-                <operation-button
-                        v-if="$auth('ticket-ticket-executes-del')"
-                        :type="2"
-                        title="是否要删除该条数据?"
-                        @confirm="batchDelete(record.id)">删除</operation-button>
-              </template>
-            </span>
-        </s-table>
-        <base-form ref="baseModal" @ok="handleOk"/>
-        <detail ref="detailModal"/>
-    </a-card>
-</template>
-
-<script>
-    import { STable, Ellipsis } from '@/components'
-    import BaseForm from './modules/BaseForm'
-    import Detail from './modules/Detail'
-    import { getTicketExecutePage, deleteTicketExecutes, fetchTicketExecute, exportTicketExecute } from '@/api/ticket/ticketexecute'
-
-    export default {
-        name: 'TicketExecuteList',
-        components: {
-            STable,
-            Ellipsis,
-            BaseForm,
-            Detail
-        },
-        data () {
-            return {
-                // 查询参数
-                queryParam: {
-                },
-                // 表头
-                columns: [
-                    {
-                        title: '序号',
-                        dataIndex: 'index',
-                        customRender: (text, record, index) => {
-                            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-                        }
-                    },
-                                                                                                                                                {
-                                title: '编号',
-                                dataIndex: 'no'
-                            },
-                                                                                                                                                        {
-                                title: '工作票类别',
-                                dataIndex: 'type'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人',
-                                dataIndex: 'chargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作班人员',
-                                dataIndex: 'workBanUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作站变电站名称',
-                                dataIndex: 'stationName'
-                            },
-                                                                                                                                                        {
-                                title: '工作任务',
-                                dataIndex: 'content'
-                            },
-                                                                                                                                                        {
-                                title: '计划工作开始时间',
-                                dataIndex: 'planStartTime'
-                            },
-                                                                                                                                                        {
-                                title: '计划工作结束时间',
-                                dataIndex: 'planEndTime'
-                            },
-                                                                                                                                                        {
-                                title: '签发人签名',
-                                dataIndex: 'signUserId'
-                            },
-                                                                                                                                                        {
-                                title: '签发日期',
-                                dataIndex: 'signDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '收到工作票时间',
-                                dataIndex: 'receiveDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '运行值班人员签名',
-                                dataIndex: 'zhibaoUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人签名',
-                                dataIndex: 'signChargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '确认工作票时间',
-                                dataIndex: 'sureDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人确认内容签名',
-                                dataIndex: 'sureChargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作许可人确认内容签名',
-                                dataIndex: 'sureXukeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '许可开始工作时间',
-                                dataIndex: 'xuekeStartDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '确认工作任务和安全措施签名',
-                                dataIndex: 'sureContentSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '原工作负责人',
-                                dataIndex: 'oldChargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人变动时间',
-                                dataIndex: 'changeDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人变动签名',
-                                dataIndex: 'changeSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动情况1',
-                                dataIndex: 'workUserChangeSituation'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动情况2',
-                                dataIndex: 'workUserChangeSituationTwo'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动情况时间1',
-                                dataIndex: 'workUserChangeSituationTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动情况时间2',
-                                dataIndex: 'workUserChangeSituationTimeTwo'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动签名',
-                                dataIndex: 'workUserChangeSituationSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作票延期截止时间',
-                                dataIndex: 'yqEndDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作票延期工作负责人签名',
-                                dataIndex: 'yqChargeSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作票延期工作许可人签名',
-                                dataIndex: 'yqXukeSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作终结时间',
-                                dataIndex: 'workFinishDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作终结负责人签名',
-                                dataIndex: 'workFinishChargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作终结许可人签名',
-                                dataIndex: 'workFinishXukeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作票终结时间',
-                                dataIndex: 'ticketFinishDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作票终结许可人签名',
-                                dataIndex: 'ticketFinishXukeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作票终结备注',
-                                dataIndex: 'ticketFinishRemark'
-                            },
-                                                                                                                                                        {
-                                title: '状态0:已废弃1:执行中2:已退票3:工作已终结4:工作票已终结',
-                                dataIndex: 'status'
-                            },
-                                                                                                                                                        {
-                                title: '备注',
-                                dataIndex: 'remark1'
-                            },
-                                                                                                                                                        {
-                                title: '创建日期',
-                                dataIndex: 'createdTime'
-                            },
-                                                                                                                                                                                    {
-                        title: '操作',
-                        key: 'action',
-                        width: '200px',
-                        align: 'center',
-                        scopedSlots: { customRender: 'action' }
-                    }
-                ],
-                // 下拉框map
-                                // 加载数据方法 必须为 Promise 对象
-                loadData: parameter => {
-                    parameter = {
-                        ...parameter,
-                        ...this.queryParam
-                    }
-                    return getTicketExecutePage(parameter)
-                            .then(res => {
-                                return res.data
-                            })
-                },
-                selectedRowKeys: [],
-                selectedRows: [],
-
-                options: {
-                    alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                    rowSelection: {
-                        selectedRowKeys: this.selectedRowKeys,
-                        onChange: this.onSelectChange
-                    }
-                },
-                optionAlertShow: false
-            }
-        },
-        created () {
-            // 下拉框map
-                        this.tableOption()
-        },
-        methods: {
-            tableOption () {
-                if (!this.optionAlertShow) {
-                    this.options = {
-                        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                        rowSelection: {
-                            selectedRowKeys: this.selectedRowKeys,
-                            onChange: this.onSelectChange,
-                            getCheckboxProps: record => ({
-                                props: {
-                                    disabled: false,
-                                    name: record.id
-                                }
-                            })
-                        }
-                    }
-                    this.optionAlertShow = true
-                } else {
-                    this.options = {
-                        alert: false,
-                        rowSelection: null
-                    }
-                    this.optionAlertShow = false
-                }
-            },
-            batchDelete (id) {
-                let ids = []
-                if (this.BaseTool.String.isBlank(id)) {
-                    const length = this.selectedRows.length
-                    if (length === 0) {
-                        this.$message.info('请选择要删除的记录')
-                                return
-                    }
-                    ids = this.selectedRows.map(item => item.id)
-                } else {
-                    ids = [id]
-                }
-                deleteTicketExecutes(ids).then(res => {
-                    this.$message.info('删除成功')
-                    this.handleOk()
-                    this.$refs.table.clearSelected()
-                })
-            },
-            handleEdit (record) {
-                fetchTicketExecute({ id: record.id }).then(res => {
-                    const modal = this.$refs.baseModal
-                    modal.base(res.data)
-                })
-            },
-            handleView (record) {
-                fetchTicketExecute({ id: record.id }).then(res => {
-                    const modal = this.$refs.detailModal
-                    modal.base(res.data)
-                })
-            },
-            handleOk () {
-                this.$refs.table.refresh()
-            },
-            onSelectChange (selectedRowKeys, selectedRows) {
-                this.selectedRowKeys = selectedRowKeys
-                this.selectedRows = selectedRows
-            },
-            resetSearchForm () {
-                this.queryParam = {
-                }
-                this.$refs.table.refresh(true)
-            },
-            doExport () {
-                const parameter = {
-                    ...this.queryParam
-                }
-                exportTicketExecute(parameter).then(file => {
-                    this.BaseTool.UPLOAD.downLoadExportExcel(file)
-                })
-            },
-            handleEnter () {
-                this.$refs.table.refresh(true)
-            }
-        }
-    }
-</script>

+ 0 - 516
src/views/ticket/ticketexecute/modules/BaseForm.vue

@@ -1,516 +0,0 @@
-<template>
-    <a-modal
-            :title="modalTitle"
-            :width="800"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-                    class="ant-modal2"
-                    @cancel="handleCancel"
-    >
-        <a-form :form="form">
-            <row-list :col="1" v-show="false">
-                <row-item>
-                    <a-form-item>
-                        <a-input v-decorator="['id']" type="hidden"/>
-                    </a-form-item>
-                </row-item>
-            </row-list>
-                            <row-list :col="2">
-                                                                                                                    <row-item>
-
-                                <a-form-item
-                                        label="编号"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['no', {rules: [{required: true, message: '编号不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作票类别"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['type', {rules: [{required: true, message: '工作票类别不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作负责人"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['chargeUserId', {rules: [{required: true, message: '工作负责人不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作班人员"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['workBanUserId', {rules: [{required: true, message: '工作班人员不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作站变电站名称"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['stationName', {rules: [{required: true, message: '工作站变电站名称不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作任务"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['content', {rules: [{required: true, message: '工作任务不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="计划工作开始时间"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="计划工作结束时间"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="签发人签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['signUserId', {rules: [{required: true, message: '签发人签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="签发日期"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="收到工作票时间"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="运行值班人员签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['zhibaoUserId', {rules: [{required: true, message: '运行值班人员签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作负责人签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['signChargeUserId', {rules: [{required: true, message: '工作负责人签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="确认工作票时间"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作负责人确认内容签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['sureChargeUserId', {rules: [{required: true, message: '工作负责人确认内容签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作许可人确认内容签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['sureXukeUserId', {rules: [{required: true, message: '工作许可人确认内容签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="许可开始工作时间"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="确认工作任务和安全措施签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['sureContentSignUserId', {rules: [{required: true, message: '确认工作任务和安全措施签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="原工作负责人"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['oldChargeUserId', {rules: [{required: true, message: '原工作负责人不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作负责人变动时间"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作负责人变动签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['changeSignUserId', {rules: [{required: true, message: '工作负责人变动签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作人员变动情况1"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['workUserChangeSituation', {rules: [{required: true, message: '工作人员变动情况1不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作人员变动情况2"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['workUserChangeSituationTwo', {rules: [{required: true, message: '工作人员变动情况2不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作人员变动情况时间1"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作人员变动情况时间2"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作人员变动签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['workUserChangeSituationSignUserId', {rules: [{required: true, message: '工作人员变动签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作票延期截止时间"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作票延期工作负责人签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['yqChargeSignUserId', {rules: [{required: true, message: '工作票延期工作负责人签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作票延期工作许可人签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['yqXukeSignUserId', {rules: [{required: true, message: '工作票延期工作许可人签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作终结时间"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作终结负责人签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['workFinishChargeUserId', {rules: [{required: true, message: '工作终结负责人签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作终结许可人签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['workFinishXukeUserId', {rules: [{required: true, message: '工作终结许可人签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作票终结时间"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作票终结许可人签名"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['ticketFinishXukeUserId', {rules: [{required: true, message: '工作票终结许可人签名不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="工作票终结备注"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="状态0:已废弃1:执行中2:已退票3:工作已终结4:工作票已终结"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-
-                                <a-form-item
-                                        label="备注"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['remark1', {rules: [{required: true, message: '备注不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                                                                                                                </row-list>
-                    </a-form>
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import pick from 'lodash.pick'
-    import {addTicketExecute, updateTicketExecute } from '@/api/ticket/ticketexecute'
-
-    export default {
-        name: 'BaseTicketExecute',
-        data() {
-            return {
-                confirmLoading: false,
-                modalTitle: null,
-                form: this.$form.createForm(this),
-                visible: false,
-            // 下拉框map
-                    }
-        },
-        props: {},
-        created() {
-            // 下拉框map
-                    },
-        methods: {
-            base(record) {
-                this.visible = true
-                // 如果是空标识添加
-                if (this.BaseTool.Object.isBlank(record)) {
-                    this.modalTitle = '添加'
-                    return
-                }
-                this.modalTitle = '编辑'
-                const {form: {setFieldsValue}} = this
-                // 日期处理
-                                this.$nextTick(() => {
-                    setFieldsValue(Object.assign(pick(record, [
-                                                                                    'id',
-                                                                                                                'no',
-                                                                                                                'type',
-                                                                                                                'chargeUserId',
-                                                                                                                'workBanUserId',
-                                                                                                                'stationName',
-                                                                                                                'content',
-                                                                                                                'planStartTime',
-                                                                                                                'planEndTime',
-                                                                                                                'signUserId',
-                                                                                                                'signDateTime',
-                                                                                                                'receiveDateTime',
-                                                                                                                'zhibaoUserId',
-                                                                                                                'signChargeUserId',
-                                                                                                                'sureDateTime',
-                                                                                                                'sureChargeUserId',
-                                                                                                                'sureXukeUserId',
-                                                                                                                'xuekeStartDateTime',
-                                                                                                                'sureContentSignUserId',
-                                                                                                                'oldChargeUserId',
-                                                                                                                'changeDateTime',
-                                                                                                                'changeSignUserId',
-                                                                                                                'workUserChangeSituation',
-                                                                                                                'workUserChangeSituationTwo',
-                                                                                                                'workUserChangeSituationTime',
-                                                                                                                'workUserChangeSituationTimeTwo',
-                                                                                                                'workUserChangeSituationSignUserId',
-                                                                                                                'yqEndDateTime',
-                                                                                                                'yqChargeSignUserId',
-                                                                                                                'yqXukeSignUserId',
-                                                                                                                'workFinishDateTime',
-                                                                                                                'workFinishChargeUserId',
-                                                                                                                'workFinishXukeUserId',
-                                                                                                                'ticketFinishDateTime',
-                                                                                                                'ticketFinishXukeUserId',
-                                                                                                                'ticketFinishRemark',
-                                                                                                                'status',
-                                                                                                                'remark1',
-                                                                                                                                                                                                                ])))
-                })
-            },
-            save() {
-                const {form: {validateFieldsAndScroll}} = this
-                this.confirmLoading = true
-                validateFieldsAndScroll((errors, values) => {
-                    if (errors) {
-                        this.confirmLoading = false
-                        return
-                    }
-                    // 日期处理
-                                        if (this.BaseTool.String.isBlank(values.id)) {
-                        addTicketExecute(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    } else {
-                        updateTicketExecute(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    }
-                })
-            },
-            handleCancel(values) {
-                this.visible = false
-                this.confirmLoading = false
-                this.form.resetFields()
-                if (this.BaseTool.Object.isNotBlank(values)) {
-                    this.$emit('ok', values)
-                }
-            }
-
-        }
-    }
-</script>

+ 0 - 134
src/views/ticket/ticketexecute/modules/Detail.vue

@@ -1,134 +0,0 @@
-<template>
-    <a-modal
-        :title="modalTitle"
-        :width="850"
-        :visible="visible"
-        :confirmLoading="confirmLoading"
-                    class="ant-modal2"
-                @cancel="handleCancel"
-    >
-        <detail-list title="" :col="2">
-                                                                                                    <detail-list-item term="编号">{{ model.no }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作票类别">{{ model.type }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作负责人">{{ model.chargeUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作班人员">{{ model.workBanUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作站变电站名称">{{ model.stationName }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作任务">{{ model.content }}</detail-list-item>
-                                                                                                            <detail-list-item term="计划工作开始时间">{{ model.planStartTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="计划工作结束时间">{{ model.planEndTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="签发人签名">{{ model.signUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="签发日期">{{ model.signDateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="收到工作票时间">{{ model.receiveDateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="运行值班人员签名">{{ model.zhibaoUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作负责人签名">{{ model.signChargeUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="确认工作票时间">{{ model.sureDateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作负责人确认内容签名">{{ model.sureChargeUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作许可人确认内容签名">{{ model.sureXukeUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="许可开始工作时间">{{ model.xuekeStartDateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="确认工作任务和安全措施签名">{{ model.sureContentSignUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="原工作负责人">{{ model.oldChargeUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作负责人变动时间">{{ model.changeDateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作负责人变动签名">{{ model.changeSignUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作人员变动情况1">{{ model.workUserChangeSituation }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作人员变动情况2">{{ model.workUserChangeSituationTwo }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作人员变动情况时间1">{{ model.workUserChangeSituationTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作人员变动情况时间2">{{ model.workUserChangeSituationTimeTwo }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作人员变动签名">{{ model.workUserChangeSituationSignUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作票延期截止时间">{{ model.yqEndDateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作票延期工作负责人签名">{{ model.yqChargeSignUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作票延期工作许可人签名">{{ model.yqXukeSignUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作终结时间">{{ model.workFinishDateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作终结负责人签名">{{ model.workFinishChargeUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作终结许可人签名">{{ model.workFinishXukeUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作票终结时间">{{ model.ticketFinishDateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作票终结许可人签名">{{ model.ticketFinishXukeUserId }}</detail-list-item>
-                                                                                                            <detail-list-item term="工作票终结备注">{{ model.ticketFinishRemark }}</detail-list-item>
-                                                                                                            <detail-list-item term="状态0:已废弃1:执行中2:已退票3:工作已终结4:工作票已终结">{{ model.status }}</detail-list-item>
-                                                                                                            <detail-list-item term="备注">{{ model.remark1 }}</detail-list-item>
-                                                                                                                                        <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-                                                                                                            <detail-list-item term="创建人">{{ model.createdUserId }}</detail-list-item>
-                                                        </detail-list>
-
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import DetailList from '@/components/tools/DetailList'
-    const DetailListItem = DetailList.Item
-
-    export default {
-        name: 'TicketExecuteDetail',
-        components: {
-            DetailList,
-            DetailListItem
-        },
-        data () {
-            return {
-                confirmLoading: false,
-                mdl: {},
-                modalTitle: null,
-                visible: false,
-                // 下拉框map
-                                model: {
-                                                                                                                    'no': null,
-                                                                                                'type': null,
-                                                                                                'chargeUserId': null,
-                                                                                                'workBanUserId': null,
-                                                                                                'stationName': null,
-                                                                                                'content': null,
-                                                                                                'planStartTime': null,
-                                                                                                'planEndTime': null,
-                                                                                                'signUserId': null,
-                                                                                                'signDateTime': null,
-                                                                                                'receiveDateTime': null,
-                                                                                                'zhibaoUserId': null,
-                                                                                                'signChargeUserId': null,
-                                                                                                'sureDateTime': null,
-                                                                                                'sureChargeUserId': null,
-                                                                                                'sureXukeUserId': null,
-                                                                                                'xuekeStartDateTime': null,
-                                                                                                'sureContentSignUserId': null,
-                                                                                                'oldChargeUserId': null,
-                                                                                                'changeDateTime': null,
-                                                                                                'changeSignUserId': null,
-                                                                                                'workUserChangeSituation': null,
-                                                                                                'workUserChangeSituationTwo': null,
-                                                                                                'workUserChangeSituationTime': null,
-                                                                                                'workUserChangeSituationTimeTwo': null,
-                                                                                                'workUserChangeSituationSignUserId': null,
-                                                                                                'yqEndDateTime': null,
-                                                                                                'yqChargeSignUserId': null,
-                                                                                                'yqXukeSignUserId': null,
-                                                                                                'workFinishDateTime': null,
-                                                                                                'workFinishChargeUserId': null,
-                                                                                                'workFinishXukeUserId': null,
-                                                                                                'ticketFinishDateTime': null,
-                                                                                                'ticketFinishXukeUserId': null,
-                                                                                                'ticketFinishRemark': null,
-                                                                                                'status': null,
-                                                                                                'remark1': null,
-                                                                                                                                            'updateTime': null,
-                                                                                                'createdUserId': null,
-                                                            }
-            }
-        },
-        created () {
-            // 下拉框map
-                    },
-        methods: {
-            base (record) {
-                this.visible = true
-                this.modalTitle = '详情'
-                this.model = record
-            },
-            handleCancel () {
-                this.visible = false
-                this.confirmLoading = false
-            }
-
-        }
-    }
-</script>

+ 0 - 409
src/views/ticket/ticketexecute/modules/TicketExecuteSelectModal.vue

@@ -1,409 +0,0 @@
-<template>
-    <a-modal
-            :title="modalTitle"
-            :width="1000"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-            class="ant-modal2"
-            @cancel="handleCancel"
-    >
-        <a-card :bordered="false">
-            <div class="table-page-search-wrapper">
-                <a-form layout="inline">
-                    <a-row :gutter="48">
-                        <a-col :md="8" :sm="24">
-                            <a-form-item label="关键字">
-                                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :md="8 || 24" :sm="24">
-                <span class="table-page-search-submitButtons">
-                  <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-                </span>
-                        </a-col>
-                    </a-row>
-                </a-form>
-            </div>
-
-            <div class="table-operator">
-            </div>
-
-            <s-table
-                    ref="table"
-                    size="default"
-                    rowKey="id"
-                    :columns="columns"
-                    :data="loadData"
-                    :alert="options.alert"
-                    :customRow="options.customRow"
-                    :rowSelection="options.rowSelection"
-                    showPagination="auto"
-            >
-                <span slot="action" slot-scope="record1">
-                  <template>
-                    <a @click="handleView(record1)">查看</a>
-                  </template>
-                </span>
-            </s-table>
-            <detail ref="detailModal"/>
-        </a-card>
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">取消</a-button>
-            <a-button :loading="confirmLoading" type="primary" @click="handleSelect()">确定</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import { STable, Ellipsis } from '@/components'
-    import Detail from './Detail'
-    import { getTicketExecutePage, fetchTicketExecute } from '@/api/ticket/ticketexecute'
-
-    export default {
-        name: 'TicketExecuteSelectModal',
-        components: {
-            STable,
-            Ellipsis,
-            Detail
-        },
-        props: {
-            type: {
-                type: String,
-                default: 'radio'
-            },
-            selectedRowKey: {
-                type: Array,
-                default: () => {
-                    return []
-                }
-            },
-            selectedRow: {
-                type: Array,
-                default: () => {
-                    return []
-                }
-            }
-        },
-        data () {
-            return {
-                confirmLoading: false,
-                mdl: {},
-                modalTitle: null,
-                visible: false,
-                record: null,
-                // 查询参数
-                queryParam: {
-                },
-                extraQueryParam: {
-                },
-                // 表头
-                columns: [
-                    {
-                        title: '序号',
-                        dataIndex: 'index',
-                        customRender: (text, record, index) => {
-                            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-                        }
-                    },
-                                                                                                                                                {
-                                title: '编号',
-                                dataIndex: 'no'
-                            },
-                                                                                                                                                        {
-                                title: '工作票类别',
-                                dataIndex: 'type'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人',
-                                dataIndex: 'chargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作班人员',
-                                dataIndex: 'workBanUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作站变电站名称',
-                                dataIndex: 'stationName'
-                            },
-                                                                                                                                                        {
-                                title: '工作任务',
-                                dataIndex: 'content'
-                            },
-                                                                                                                                                        {
-                                title: '计划工作开始时间',
-                                dataIndex: 'planStartTime'
-                            },
-                                                                                                                                                        {
-                                title: '计划工作结束时间',
-                                dataIndex: 'planEndTime'
-                            },
-                                                                                                                                                        {
-                                title: '签发人签名',
-                                dataIndex: 'signUserId'
-                            },
-                                                                                                                                                        {
-                                title: '签发日期',
-                                dataIndex: 'signDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '收到工作票时间',
-                                dataIndex: 'receiveDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '运行值班人员签名',
-                                dataIndex: 'zhibaoUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人签名',
-                                dataIndex: 'signChargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '确认工作票时间',
-                                dataIndex: 'sureDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人确认内容签名',
-                                dataIndex: 'sureChargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作许可人确认内容签名',
-                                dataIndex: 'sureXukeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '许可开始工作时间',
-                                dataIndex: 'xuekeStartDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '确认工作任务和安全措施签名',
-                                dataIndex: 'sureContentSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '原工作负责人',
-                                dataIndex: 'oldChargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人变动时间',
-                                dataIndex: 'changeDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作负责人变动签名',
-                                dataIndex: 'changeSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动情况1',
-                                dataIndex: 'workUserChangeSituation'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动情况2',
-                                dataIndex: 'workUserChangeSituationTwo'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动情况时间1',
-                                dataIndex: 'workUserChangeSituationTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动情况时间2',
-                                dataIndex: 'workUserChangeSituationTimeTwo'
-                            },
-                                                                                                                                                        {
-                                title: '工作人员变动签名',
-                                dataIndex: 'workUserChangeSituationSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作票延期截止时间',
-                                dataIndex: 'yqEndDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作票延期工作负责人签名',
-                                dataIndex: 'yqChargeSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作票延期工作许可人签名',
-                                dataIndex: 'yqXukeSignUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作终结时间',
-                                dataIndex: 'workFinishDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作终结负责人签名',
-                                dataIndex: 'workFinishChargeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作终结许可人签名',
-                                dataIndex: 'workFinishXukeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作票终结时间',
-                                dataIndex: 'ticketFinishDateTime'
-                            },
-                                                                                                                                                        {
-                                title: '工作票终结许可人签名',
-                                dataIndex: 'ticketFinishXukeUserId'
-                            },
-                                                                                                                                                        {
-                                title: '工作票终结备注',
-                                dataIndex: 'ticketFinishRemark'
-                            },
-                                                                                                                                                        {
-                                title: '状态0:已废弃1:执行中2:已退票3:工作已终结4:工作票已终结',
-                                dataIndex: 'status'
-                            },
-                                                                                                                                                        {
-                                title: '备注',
-                                dataIndex: 'remark1'
-                            },
-                                                                                                                                                        {
-                                title: '创建日期',
-                                dataIndex: 'createdTime'
-                            },
-                                                                                                                                                                                    {
-                        title: '操作',
-                        key: 'action',
-                        width: '200px',
-                        align: 'center',
-                        scopedSlots: { customRender: 'action' }
-                    }
-                ],
-                // 下拉框map
-                                // 加载数据方法 必须为 Promise 对象
-                loadData: parameter => {
-                    parameter = {
-                        ...parameter,
-                        ...this.queryParam,
-                        ...this.extraQueryParam,
-                        dataScope: {
-                            sortBy: 'desc',
-                            sortName: 'update_time'
-                        }
-                    }
-                    return getTicketExecutePage(Object.assign(parameter, this.queryParam))
-                            .then(res => {
-                                return res.data
-                            })
-                },
-                selectedRowKeys: [],
-                selectedRows: [],
-
-                options: {
-                    alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                    rowSelection: {
-                        selectedRowKeys: this.selectedRowKeys,
-                        onChange: this.onSelectChange
-                    }
-                },
-                optionAlertShow: false,
-                isCreated: false
-            }
-        },
-        created () {
-            // 下拉框map
-                    },
-        methods: {
-            tableOption () {
-                if (!this.optionAlertShow) {
-                    this.options = {
-                        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                        rowSelection: {
-                            selectedRowKeys: this.selectedRowKeys,
-                            onChange: this.onSelectChange,
-                            type: this.type,
-                            getCheckboxProps: record => ({
-                                props: {
-                                    disabled: false,
-                                    name: record.id
-                                }
-                            })
-                        },
-                        customRow: (record) => {
-                            return {
-                                on: { // 事件
-                                    click: (event) => { // 点击行
-                                        // 选择对象
-                                        this.mySelect([record.id], [record])
-                                    },
-                                    dblclick: (event) => {
-                                        this.mySelect([record.id], [record])
-                                        this.handleSelect()
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    this.optionAlertShow = true
-                } else {
-                    this.options = {
-                        alert: false,
-                        rowSelection: null
-                    }
-                    this.optionAlertShow = false
-                }
-            },
-            handleView (record) {
-                fetchTicketExecute({ id: record.id }).then(res => {
-                    const modal = this.$refs.detailModal
-                    modal.base(res.data)
-                })
-            },
-            handleOk () {
-                this.$refs.table.refresh()
-            },
-            onSelectChange (selectedRowKeys, selectedRows) {
-                this.selectedRowKeys = selectedRowKeys
-                this.selectedRows = selectedRows
-            },
-            resetSearchForm () {
-                this.queryParam = {
-                }
-                this.$refs.table.refresh(true)
-            },
-            base (record, queryParam = {}) {
-                this.visible = true
-                this.modalTitle = '选择信息'
-                this.extraQueryParam = queryParam
-                this.record = record
-                if (this.isCreated) {
-                    this.$refs.table.clearSelected()
-                    this.options.rowSelection.type = this.type
-                    this.handleOk()
-                } else {
-                    this.tableOption()
-                    this.isCreated = true
-                }
-            },
-            handleCancel () {
-                this.visible = false
-                this.confirmLoading = false
-            },
-            handleSelect () {
-                if (this.selectedRowKeys.length === 0) {
-                    this.$message.warn('请至少选择一项信息')
-                } else {
-                    this.confirmLoading = true
-                    this.$emit('selected', this.record, this.selectedRowKeys, this.selectedRows)
-                    this.confirmLoading = false
-                    this.visible = false
-                }
-            },
-            mySelect(selectedRowKeys, selectedRows) {
-                if (this.type === 'radio') {
-                    this.$refs.table.updateSelect(selectedRowKeys, selectedRows)
-                            this.$refs.table.rowSelection.onChange(selectedRowKeys, selectedRows)
-                } else {
-                    let mySelectedRowKeys
-                    let mySelectedRows = this.selectedRows.filter(item => item.id !== selectedRowKeys[0])
-                    if (this.selectedRowKeys.includes(selectedRowKeys[0])) {
-                        mySelectedRowKeys = this.selectedRowKeys.filter(item => item !== selectedRowKeys[0])
-                    } else {
-                        mySelectedRowKeys = [...selectedRowKeys, ...this.selectedRowKeys]
-                        mySelectedRows = [...mySelectedRows, ...selectedRows]
-                    }
-                    this.$refs.table.updateSelect(mySelectedRowKeys, mySelectedRows)
-                            this.$refs.table.rowSelection.onChange(mySelectedRowKeys, mySelectedRows)
-                }
-
-            }
-        }
-    }
-</script>

+ 0 - 243
src/views/ticket/ticketsafe/TicketSafe.vue

@@ -1,243 +0,0 @@
-<template>
-    <a-card :bordered="false">
-        <div class="table-page-search-wrapper"  @keyup.enter="handleEnter">
-            <a-form layout="inline">
-                <a-row :gutter="48">
-                    <a-col :md="8" :sm="24">
-                        <a-form-item label="关键字">
-                            <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-                    </a-col>
-                </a-row>
-            </a-form>
-        </div>
-
-        <div class="table-operator">
-            <a-button v-if="$auth('ticket-ticket-safe-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('ticket-ticket-safe-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-            <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('ticket-ticket-safe-del')">
-                <a-menu slot="overlay">
-                    <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
-                        <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-                    </a-popconfirm>
-                </a-menu>
-                <a-button style="margin-left: 8px">
-                    批量操作 <a-icon type="down" />
-                </a-button>
-            </a-dropdown>
-        </div>
-
-        <s-table
-                ref="table"
-                size="default"
-                rowKey="ticketId"
-                :bordered="this.MyGlobalConstant.BORDERED"
-                :columns="columns"
-                :data="loadData"
-                :alert="options.alert"
-                :rowSelection="options.rowSelection"
-                showPagination="auto"
-        >
-            <span slot="action" slot-scope="record">
-              <template>
-                <a @click="handleView(record)">查看</a>
-                <operation-button
-                        v-if="$auth('ticket-ticket-safe-edit')" @click="handleEdit(record)"
-                      >修改</operation-button>
-                <operation-button
-                        v-if="$auth('ticket-ticket-safe-del')"
-                        :type="2"
-                        title="是否要删除该条数据?"
-                        @confirm="batchDelete(record.id)">删除</operation-button>
-              </template>
-            </span>
-        </s-table>
-        <base-form ref="baseModal" @ok="handleOk"/>
-        <detail ref="detailModal"/>
-    </a-card>
-</template>
-
-<script>
-    import { STable, Ellipsis } from '@/components'
-    import BaseForm from './modules/BaseForm'
-    import Detail from './modules/Detail'
-    import { getTicketSafePage, deleteTicketSafes, fetchTicketSafe, exportTicketSafe } from '@/api/ticket/ticketsafe'
-
-    export default {
-        name: 'TicketSafeList',
-        components: {
-            STable,
-            Ellipsis,
-            BaseForm,
-            Detail
-        },
-        data () {
-            return {
-                // 查询参数
-                queryParam: {
-                },
-                // 表头
-                columns: [
-                    {
-                        title: '序号',
-                        dataIndex: 'index',
-                        customRender: (text, record, index) => {
-                            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-                        }
-                    },
-                                                                                                                                                {
-                                title: '所属工作票',
-                                dataIndex: 'ticketId'
-                            },
-                                                                                                                                                        {
-                                title: '安全类别',
-                                dataIndex: 'type'
-                            },
-                                                                                                                                                        {
-                                title: '安措名称',
-                                dataIndex: 'name'
-                            },
-                                                                                                                                                        {
-                                title: '安措内容',
-                                dataIndex: 'content'
-                            },
-                                                                                                                                                        {
-                                title: '危险等级',
-                                dataIndex: 'dangerLevel'
-                            },
-                                                                                                                                                        {
-                                title: '备注',
-                                dataIndex: 'remark'
-                            },
-                                                                                                                                                        {
-                                title: '状态0:已废弃 1:启用中',
-                                dataIndex: 'status'
-                            },
-                                                                                                                                                                                                    {
-                                title: '创建日期',
-                                dataIndex: 'createdTime'
-                            },
-                                                                                                                                        {
-                        title: '操作',
-                        key: 'action',
-                        width: '200px',
-                        align: 'center',
-                        scopedSlots: { customRender: 'action' }
-                    }
-                ],
-                // 下拉框map
-                                // 加载数据方法 必须为 Promise 对象
-                loadData: parameter => {
-                    parameter = {
-                        ...parameter,
-                        ...this.queryParam
-                    }
-                    return getTicketSafePage(parameter)
-                            .then(res => {
-                                return res.data
-                            })
-                },
-                selectedRowKeys: [],
-                selectedRows: [],
-
-                options: {
-                    alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                    rowSelection: {
-                        selectedRowKeys: this.selectedRowKeys,
-                        onChange: this.onSelectChange
-                    }
-                },
-                optionAlertShow: false
-            }
-        },
-        created () {
-            // 下拉框map
-                        this.tableOption()
-        },
-        methods: {
-            tableOption () {
-                if (!this.optionAlertShow) {
-                    this.options = {
-                        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                        rowSelection: {
-                            selectedRowKeys: this.selectedRowKeys,
-                            onChange: this.onSelectChange,
-                            getCheckboxProps: record => ({
-                                props: {
-                                    disabled: false,
-                                    name: record.id
-                                }
-                            })
-                        }
-                    }
-                    this.optionAlertShow = true
-                } else {
-                    this.options = {
-                        alert: false,
-                        rowSelection: null
-                    }
-                    this.optionAlertShow = false
-                }
-            },
-            batchDelete (id) {
-                let ids = []
-                if (this.BaseTool.String.isBlank(id)) {
-                    const length = this.selectedRows.length
-                    if (length === 0) {
-                        this.$message.info('请选择要删除的记录')
-                                return
-                    }
-                    ids = this.selectedRows.map(item => item.id)
-                } else {
-                    ids = [id]
-                }
-                deleteTicketSafes(ids).then(res => {
-                    this.$message.info('删除成功')
-                    this.handleOk()
-                    this.$refs.table.clearSelected()
-                })
-            },
-            handleEdit (record) {
-                fetchTicketSafe({ id: record.id }).then(res => {
-                    const modal = this.$refs.baseModal
-                    modal.base(res.data)
-                })
-            },
-            handleView (record) {
-                fetchTicketSafe({ id: record.id }).then(res => {
-                    const modal = this.$refs.detailModal
-                    modal.base(res.data)
-                })
-            },
-            handleOk () {
-                this.$refs.table.refresh()
-            },
-            onSelectChange (selectedRowKeys, selectedRows) {
-                this.selectedRowKeys = selectedRowKeys
-                this.selectedRows = selectedRows
-            },
-            resetSearchForm () {
-                this.queryParam = {
-                }
-                this.$refs.table.refresh(true)
-            },
-            doExport () {
-                const parameter = {
-                    ...this.queryParam
-                }
-                exportTicketSafe(parameter).then(file => {
-                    this.BaseTool.UPLOAD.downLoadExportExcel(file)
-                })
-            },
-            handleEnter () {
-                this.$refs.table.refresh(true)
-            }
-        }
-    }
-</script>

+ 0 - 172
src/views/ticket/ticketsafe/modules/BaseForm.vue

@@ -1,172 +0,0 @@
-<template>
-    <a-modal
-            :title="modalTitle"
-            :width="800"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-                    @cancel="handleCancel"
-    >
-        <a-form :form="form">
-            <row-list :col="1" v-show="false">
-                <row-item>
-                    <a-form-item>
-                        <a-input v-decorator="['id']" type="hidden"/>
-                    </a-form-item>
-                </row-item>
-            </row-list>
-                            <row-list :col="1">
-                                                                                                                    <row-item>
-                                <a-form-item
-                                        label="所属工作票"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['ticketId', {rules: [{required: true, message: '所属工作票不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="安全类别"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['type', {rules: [{required: true, message: '安全类别不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="安措名称"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['name', {rules: [{required: true, message: '安措名称不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="安措内容"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['content', {rules: [{required: true, message: '安措内容不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="危险等级"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="备注"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['remark', {rules: [{required: true, message: '备注不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="状态0:已废弃 1:启用中"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                                                                                                                </row-list>
-                    </a-form>
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="safe()">保存</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import pick from 'lodash.pick'
-    import {addTicketSafe, updateTicketSafe } from '@/api/ticket/ticketsafe'
-
-    export default {
-        name: 'BaseTicketSafe',
-        data() {
-            return {
-                confirmLoading: false,
-                modalTitle: null,
-                form: this.$form.createForm(this),
-                visible: false,
-            // 下拉框map
-                    }
-        },
-        props: {},
-        created() {
-            // 下拉框map
-                    },
-        methods: {
-            base(record) {
-                this.visible = true
-                // 如果是空标识添加
-                if (this.BaseTool.Object.isBlank(record)) {
-                    this.modalTitle = '添加'
-                    return
-                }
-                this.modalTitle = '编辑'
-                const {form: {setFieldsValue}} = this
-                // 日期处理
-                                this.$nextTick(() => {
-                    setFieldsValue(Object.assign(pick(record, [
-                                                                                    'id',
-                                                                                                                'ticketId',
-                                                                                                                'type',
-                                                                                                                'name',
-                                                                                                                'content',
-                                                                                                                'dangerLevel',
-                                                                                                                'remark',
-                                                                                                                'status',
-                                                                                                                                                                                                                ])))
-                })
-            },
-            safe() {
-                const {form: {validateFieldsAndScroll}} = this
-                this.confirmLoading = true
-                validateFieldsAndScroll((errors, values) => {
-                    if (errors) {
-                        this.confirmLoading = false
-                        return
-                    }
-                    // 日期处理
-                                        if (this.BaseTool.String.isBlank(values.id)) {
-                        addTicketSafe(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    } else {
-                        updateTicketSafe(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    }
-                })
-            },
-            handleCancel(values) {
-                this.visible = false
-                this.confirmLoading = false
-                this.form.resetFields()
-                if (this.BaseTool.Object.isNotBlank(values)) {
-                    this.$emit('ok', values)
-                }
-            }
-
-        }
-    }
-</script>

+ 0 - 73
src/views/ticket/ticketsafe/modules/Detail.vue

@@ -1,73 +0,0 @@
-<template>
-    <a-modal
-        :title="modalTitle"
-        :width="850"
-        :visible="visible"
-        :confirmLoading="confirmLoading"
-                @cancel="handleCancel"
-    >
-        <detail-list title="" :col="2">
-                                                                                                    <detail-list-item term="所属工作票">{{ model.ticketId }}</detail-list-item>
-                                                                                                            <detail-list-item term="安全类别">{{ model.type }}</detail-list-item>
-                                                                                                            <detail-list-item term="安措名称">{{ model.name }}</detail-list-item>
-                                                                                                            <detail-list-item term="安措内容">{{ model.content }}</detail-list-item>
-                                                                                                            <detail-list-item term="危险等级">{{ model.dangerLevel }}</detail-list-item>
-                                                                                                            <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-                                                                                                            <detail-list-item term="状态0:已废弃 1:启用中">{{ model.status }}</detail-list-item>
-                                                                                                            <detail-list-item term="创建人">{{ model.createdUserId }}</detail-list-item>
-                                                                                                                                        <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-                                                        </detail-list>
-
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import DetailList from '@/components/tools/DetailList'
-    const DetailListItem = DetailList.Item
-
-    export default {
-        name: 'TicketSafeDetail',
-        components: {
-            DetailList,
-            DetailListItem
-        },
-        data () {
-            return {
-                confirmLoading: false,
-                mdl: {},
-                modalTitle: null,
-                visible: false,
-                // 下拉框map
-                                model: {
-                                                                                                                    'ticketId': null,
-                                                                                                'type': null,
-                                                                                                'name': null,
-                                                                                                'content': null,
-                                                                                                'dangerLevel': null,
-                                                                                                'remark': null,
-                                                                                                'status': null,
-                                                                                                'createdUserId': null,
-                                                                                                                                            'updateTime': null,
-                                                            }
-            }
-        },
-        created () {
-            // 下拉框map
-                    },
-        methods: {
-            base (record) {
-                this.visible = true
-                this.modalTitle = '详情'
-                this.model = record
-            },
-            handleCancel () {
-                this.visible = false
-                this.confirmLoading = false
-            }
-
-        }
-    }
-</script>

+ 0 - 289
src/views/ticket/ticketsafe/modules/TicketSafeSelectModal.vue

@@ -1,289 +0,0 @@
-<template>
-    <a-modal
-            :title="modalTitle"
-            :width="1000"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-            class="ant-modal2"
-            @cancel="handleCancel"
-    >
-        <a-card :bordered="false">
-            <div class="table-page-search-wrapper">
-                <a-form layout="inline">
-                    <a-row :gutter="48">
-                        <a-col :md="8" :sm="24">
-                            <a-form-item label="关键字">
-                                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :md="8 || 24" :sm="24">
-                <span class="table-page-search-submitButtons">
-                  <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-                </span>
-                        </a-col>
-                    </a-row>
-                </a-form>
-            </div>
-
-            <div class="table-operator">
-            </div>
-
-            <s-table
-                    ref="table"
-                    size="default"
-                    rowKey="id"
-                    :columns="columns"
-                    :data="loadData"
-                    :alert="options.alert"
-                    :customRow="options.customRow"
-                    :rowSelection="options.rowSelection"
-                    showPagination="auto"
-            >
-                <span slot="action" slot-scope="record1">
-                  <template>
-                    <a @click="handleView(record1)">查看</a>
-                  </template>
-                </span>
-            </s-table>
-            <detail ref="detailModal"/>
-        </a-card>
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">取消</a-button>
-            <a-button :loading="confirmLoading" type="primary" @click="handleSelect()">确定</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import { STable, Ellipsis } from '@/components'
-    import Detail from './Detail'
-    import { getTicketSafePage, fetchTicketSafe } from '@/api/ticket/ticketsafe'
-
-    export default {
-        name: 'TicketSafeSelectModal',
-        components: {
-            STable,
-            Ellipsis,
-            Detail
-        },
-        props: {
-            type: {
-                type: String,
-                default: 'radio'
-            },
-            selectedRowKey: {
-                type: Array,
-                default: () => {
-                    return []
-                }
-            },
-            selectedRow: {
-                type: Array,
-                default: () => {
-                    return []
-                }
-            }
-        },
-        data () {
-            return {
-                confirmLoading: false,
-                mdl: {},
-                modalTitle: null,
-                visible: false,
-                record: null,
-                // 查询参数
-                queryParam: {
-                },
-                extraQueryParam: {
-                },
-                // 表头
-                columns: [
-                    {
-                        title: '序号',
-                        dataIndex: 'index',
-                        customRender: (text, record, index) => {
-                            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-                        }
-                    },
-                                                                                                                                                {
-                                title: '所属工作票',
-                                dataIndex: 'ticketId'
-                            },
-                                                                                                                                                        {
-                                title: '安全类别',
-                                dataIndex: 'type'
-                            },
-                                                                                                                                                        {
-                                title: '安措名称',
-                                dataIndex: 'name'
-                            },
-                                                                                                                                                        {
-                                title: '安措内容',
-                                dataIndex: 'content'
-                            },
-                                                                                                                                                        {
-                                title: '危险等级',
-                                dataIndex: 'dangerLevel'
-                            },
-                                                                                                                                                        {
-                                title: '备注',
-                                dataIndex: 'remark'
-                            },
-                                                                                                                                                        {
-                                title: '状态0:已废弃 1:启用中',
-                                dataIndex: 'status'
-                            },
-                                                                                                                                                                                                    {
-                                title: '创建日期',
-                                dataIndex: 'createdTime'
-                            },
-                                                                                                                                        {
-                        title: '操作',
-                        key: 'action',
-                        width: '200px',
-                        align: 'center',
-                        scopedSlots: { customRender: 'action' }
-                    }
-                ],
-                // 下拉框map
-                                // 加载数据方法 必须为 Promise 对象
-                loadData: parameter => {
-                    parameter = {
-                        ...parameter,
-                        ...this.queryParam,
-                        ...this.extraQueryParam,
-                        dataScope: {
-                            sortBy: 'desc',
-                            sortName: 'update_time'
-                        }
-                    }
-                    return getTicketSafePage(Object.assign(parameter, this.queryParam))
-                            .then(res => {
-                                return res.data
-                            })
-                },
-                selectedRowKeys: [],
-                selectedRows: [],
-
-                options: {
-                    alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                    rowSelection: {
-                        selectedRowKeys: this.selectedRowKeys,
-                        onChange: this.onSelectChange
-                    }
-                },
-                optionAlertShow: false,
-                isCreated: false
-            }
-        },
-        created () {
-            // 下拉框map
-                    },
-        methods: {
-            tableOption () {
-                if (!this.optionAlertShow) {
-                    this.options = {
-                        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                        rowSelection: {
-                            selectedRowKeys: this.selectedRowKeys,
-                            onChange: this.onSelectChange,
-                            type: this.type,
-                            getCheckboxProps: record => ({
-                                props: {
-                                    disabled: false,
-                                    name: record.id
-                                }
-                            })
-                        },
-                        customRow: (record) => {
-                            return {
-                                on: { // 事件
-                                    click: (event) => { // 点击行
-                                        // 选择对象
-                                        this.mySelect([record.id], [record])
-                                    },
-                                    dblclick: (event) => {
-                                        this.mySelect([record.id], [record])
-                                        this.handleSelect()
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    this.optionAlertShow = true
-                } else {
-                    this.options = {
-                        alert: false,
-                        rowSelection: null
-                    }
-                    this.optionAlertShow = false
-                }
-            },
-            handleView (record) {
-                fetchTicketSafe({ id: record.id }).then(res => {
-                    const modal = this.$refs.detailModal
-                    modal.base(res.data)
-                })
-            },
-            handleOk () {
-                this.$refs.table.refresh()
-            },
-            onSelectChange (selectedRowKeys, selectedRows) {
-                this.selectedRowKeys = selectedRowKeys
-                this.selectedRows = selectedRows
-            },
-            resetSearchForm () {
-                this.queryParam = {
-                }
-                this.$refs.table.refresh(true)
-            },
-            base (record, queryParam = {}) {
-                this.visible = true
-                this.modalTitle = '选择信息'
-                this.extraQueryParam = queryParam
-                this.record = record
-                if (this.isCreated) {
-                    this.$refs.table.clearSelected()
-                    this.options.rowSelection.type = this.type
-                    this.handleOk()
-                } else {
-                    this.tableOption()
-                    this.isCreated = true
-                }
-            },
-            handleCancel () {
-                this.visible = false
-                this.confirmLoading = false
-            },
-            handleSelect () {
-                if (this.selectedRowKeys.length === 0) {
-                    this.$message.warn('请至少选择一项信息')
-                } else {
-                    this.confirmLoading = true
-                    this.$emit('selected', this.record, this.selectedRowKeys, this.selectedRows)
-                    this.confirmLoading = false
-                    this.visible = false
-                }
-            },
-            mySelect(selectedRowKeys, selectedRows) {
-                if (this.type === 'radio') {
-                    this.$refs.table.updateSelect(selectedRowKeys, selectedRows)
-                            this.$refs.table.rowSelection.onChange(selectedRowKeys, selectedRows)
-                } else {
-                    let mySelectedRowKeys
-                    let mySelectedRows = this.selectedRows.filter(item => item.id !== selectedRowKeys[0])
-                    if (this.selectedRowKeys.includes(selectedRowKeys[0])) {
-                        mySelectedRowKeys = this.selectedRowKeys.filter(item => item !== selectedRowKeys[0])
-                    } else {
-                        mySelectedRowKeys = [...selectedRowKeys, ...this.selectedRowKeys]
-                        mySelectedRows = [...mySelectedRows, ...selectedRows]
-                    }
-                    this.$refs.table.updateSelect(mySelectedRowKeys, mySelectedRows)
-                            this.$refs.table.rowSelection.onChange(mySelectedRowKeys, mySelectedRows)
-                }
-
-            }
-        }
-    }
-</script>

+ 0 - 247
src/views/ticket/ticketsafeexecute/TicketSafeExecute.vue

@@ -1,247 +0,0 @@
-<template>
-    <a-card :bordered="false">
-        <div class="table-page-search-wrapper"  @keyup.enter="handleEnter">
-            <a-form layout="inline">
-                <a-row :gutter="48">
-                    <a-col :md="8" :sm="24">
-                        <a-form-item label="关键字">
-                            <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-            </span>
-                    </a-col>
-                </a-row>
-            </a-form>
-        </div>
-
-        <div class="table-operator">
-            <a-button v-if="$auth('ticket-ticket-safe-executes-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('ticket-ticket-safe-executes-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-            <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('ticket-ticket-safe-executes-del')">
-                <a-menu slot="overlay">
-                    <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
-                        <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-                    </a-popconfirm>
-                </a-menu>
-                <a-button style="margin-left: 8px">
-                    批量操作 <a-icon type="down" />
-                </a-button>
-            </a-dropdown>
-        </div>
-
-        <s-table
-                ref="table"
-                size="default"
-                rowKey="id"
-                :bordered="this.MyGlobalConstant.BORDERED"
-                :columns="columns"
-                :data="loadData"
-                :alert="options.alert"
-                :rowSelection="options.rowSelection"
-                showPagination="auto"
-        >
-            <span slot="action" slot-scope="record">
-              <template>
-                <a @click="handleView(record)">查看</a>
-                <operation-button
-                        v-if="$auth('ticket-ticket-safe-executes-edit')" @click="handleEdit(record)"
-                      >修改</operation-button>
-                <operation-button
-                        v-if="$auth('ticket-ticket-safe-executes-del')"
-                        :type="2"
-                        title="是否要删除该条数据?"
-                        @confirm="batchDelete(record.id)">删除</operation-button>
-              </template>
-            </span>
-        </s-table>
-        <base-form ref="baseModal" @ok="handleOk"/>
-        <detail ref="detailModal"/>
-    </a-card>
-</template>
-
-<script>
-    import { STable, Ellipsis } from '@/components'
-    import BaseForm from './modules/BaseForm'
-    import Detail from './modules/Detail'
-    import { getTicketSafeExecutePage, deleteTicketSafeExecutes, fetchTicketSafeExecute, exportTicketSafeExecute } from '@/api/ticket/ticketsafeexecute'
-
-    export default {
-        name: 'TicketSafeExecuteList',
-        components: {
-            STable,
-            Ellipsis,
-            BaseForm,
-            Detail
-        },
-        data () {
-            return {
-                // 查询参数
-                queryParam: {
-                },
-                // 表头
-                columns: [
-                    {
-                        title: '序号',
-                        dataIndex: 'index',
-                        customRender: (text, record, index) => {
-                            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-                        }
-                    },
-                                                                                                                                                {
-                                title: '所属工作票执行单',
-                                dataIndex: 'ticketExcuteId'
-                            },
-                                                                                                                                                        {
-                                title: '安措类别',
-                                dataIndex: 'type'
-                            },
-                                                                                                                                                        {
-                                title: '安措名称',
-                                dataIndex: 'name'
-                            },
-                                                                                                                                                        {
-                                title: '安措内容',
-                                dataIndex: 'content'
-                            },
-                                                                                                                                                        {
-                                title: '危险等级',
-                                dataIndex: 'dangerLevel'
-                            },
-                                                                                                                                                        {
-                                title: '来源1:签发单2:现场补充',
-                                dataIndex: 'source'
-                            },
-                                                                                                                                                        {
-                                title: '状态1:待执行2:已执行3:已废弃',
-                                dataIndex: 'status'
-                            },
-                                                                                                                                                        {
-                                title: '备注',
-                                dataIndex: 'remark'
-                            },
-                                                                                                                                                                                                    {
-                                title: '创建日期',
-                                dataIndex: 'createdTime'
-                            },
-                                                                                                                                        {
-                        title: '操作',
-                        key: 'action',
-                        width: '200px',
-                        align: 'center',
-                        scopedSlots: { customRender: 'action' }
-                    }
-                ],
-                // 下拉框map
-                                // 加载数据方法 必须为 Promise 对象
-                loadData: parameter => {
-                    parameter = {
-                        ...parameter,
-                        ...this.queryParam
-                    }
-                    return getTicketSafeExecutePage(parameter)
-                            .then(res => {
-                                return res.data
-                            })
-                },
-                selectedRowKeys: [],
-                selectedRows: [],
-
-                options: {
-                    alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                    rowSelection: {
-                        selectedRowKeys: this.selectedRowKeys,
-                        onChange: this.onSelectChange
-                    }
-                },
-                optionAlertShow: false
-            }
-        },
-        created () {
-            // 下拉框map
-                        this.tableOption()
-        },
-        methods: {
-            tableOption () {
-                if (!this.optionAlertShow) {
-                    this.options = {
-                        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                        rowSelection: {
-                            selectedRowKeys: this.selectedRowKeys,
-                            onChange: this.onSelectChange,
-                            getCheckboxProps: record => ({
-                                props: {
-                                    disabled: false,
-                                    name: record.id
-                                }
-                            })
-                        }
-                    }
-                    this.optionAlertShow = true
-                } else {
-                    this.options = {
-                        alert: false,
-                        rowSelection: null
-                    }
-                    this.optionAlertShow = false
-                }
-            },
-            batchDelete (id) {
-                let ids = []
-                if (this.BaseTool.String.isBlank(id)) {
-                    const length = this.selectedRows.length
-                    if (length === 0) {
-                        this.$message.info('请选择要删除的记录')
-                                return
-                    }
-                    ids = this.selectedRows.map(item => item.id)
-                } else {
-                    ids = [id]
-                }
-                deleteTicketSafeExecutes(ids).then(res => {
-                    this.$message.info('删除成功')
-                    this.handleOk()
-                    this.$refs.table.clearSelected()
-                })
-            },
-            handleEdit (record) {
-                fetchTicketSafeExecute({ id: record.id }).then(res => {
-                    const modal = this.$refs.baseModal
-                    modal.base(res.data)
-                })
-            },
-            handleView (record) {
-                fetchTicketSafeExecute({ id: record.id }).then(res => {
-                    const modal = this.$refs.detailModal
-                    modal.base(res.data)
-                })
-            },
-            handleOk () {
-                this.$refs.table.refresh()
-            },
-            onSelectChange (selectedRowKeys, selectedRows) {
-                this.selectedRowKeys = selectedRowKeys
-                this.selectedRows = selectedRows
-            },
-            resetSearchForm () {
-                this.queryParam = {
-                }
-                this.$refs.table.refresh(true)
-            },
-            doExport () {
-                const parameter = {
-                    ...this.queryParam
-                }
-                exportTicketSafeExecute(parameter).then(file => {
-                    this.BaseTool.UPLOAD.downLoadExportExcel(file)
-                })
-            },
-            handleEnter () {
-                this.$refs.table.refresh(true)
-            }
-        }
-    }
-</script>

+ 0 - 181
src/views/ticket/ticketsafeexecute/modules/BaseForm.vue

@@ -1,181 +0,0 @@
-<template>
-    <a-modal
-            :title="modalTitle"
-            :width="800"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-                    @cancel="handleCancel"
-    >
-        <a-form :form="form">
-            <row-list :col="1" v-show="false">
-                <row-item>
-                    <a-form-item>
-                        <a-input v-decorator="['id']" type="hidden"/>
-                    </a-form-item>
-                </row-item>
-            </row-list>
-                            <row-list :col="1">
-                                                                                                                    <row-item>
-                                <a-form-item
-                                        label="所属工作票执行单"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['ticketExcuteId', {rules: [{required: true, message: '所属工作票执行单不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="安措类别"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['type', {rules: [{required: true, message: '安措类别不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="安措名称"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['name', {rules: [{required: true, message: '安措名称不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="安措内容"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['content', {rules: [{required: true, message: '安措内容不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="危险等级"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="来源1:签发单2:现场补充"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="状态1:待执行2:已执行3:已废弃"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                <row-item>
-                                <a-form-item
-                                        label="备注"
-                                        :labelCol="BaseTool.Constant.labelCol"
-                                        :wrapperCol="BaseTool.Constant.wrapperCol"
-                                >
-                                                                            <a-input
-                                                v-decorator="['remark', {rules: [{required: true, message: '备注不能为空'}]}]"/>
-                                                                                                                                                                                                                                                        </a-form-item>
-                            </row-item>
-                                                                                                                                                                                                </row-list>
-                    </a-form>
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="safe()">保存</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import pick from 'lodash.pick'
-    import {addTicketSafeExecute, updateTicketSafeExecute } from '@/api/ticket/ticketsafeexecute'
-
-    export default {
-        name: 'BaseTicketSafeExecute',
-        data() {
-            return {
-                confirmLoading: false,
-                modalTitle: null,
-                form: this.$form.createForm(this),
-                visible: false,
-            // 下拉框map
-                    }
-        },
-        props: {},
-        created() {
-            // 下拉框map
-                    },
-        methods: {
-            base(record) {
-                this.visible = true
-                // 如果是空标识添加
-                if (this.BaseTool.Object.isBlank(record)) {
-                    this.modalTitle = '添加'
-                    return
-                }
-                this.modalTitle = '编辑'
-                const {form: {setFieldsValue}} = this
-                // 日期处理
-                                this.$nextTick(() => {
-                    setFieldsValue(Object.assign(pick(record, [
-                                                                                    'id',
-                                                                                                                'ticketExcuteId',
-                                                                                                                'type',
-                                                                                                                'name',
-                                                                                                                'content',
-                                                                                                                'dangerLevel',
-                                                                                                                'source',
-                                                                                                                'status',
-                                                                                                                'remark',
-                                                                                                                                                                                                                ])))
-                })
-            },
-            safe() {
-                const {form: {validateFieldsAndScroll}} = this
-                this.confirmLoading = true
-                validateFieldsAndScroll((errors, values) => {
-                    if (errors) {
-                        this.confirmLoading = false
-                        return
-                    }
-                    // 日期处理
-                                        if (this.BaseTool.String.isBlank(values.id)) {
-                        addTicketSafeExecute(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    } else {
-                        updateTicketSafeExecute(values)
-                                .then(() => {
-                                    this.handleCancel(values)
-                                }).catch(() => {
-                            this.confirmLoading = false
-                        })
-                    }
-                })
-            },
-            handleCancel(values) {
-                this.visible = false
-                this.confirmLoading = false
-                this.form.resetFields()
-                if (this.BaseTool.Object.isNotBlank(values)) {
-                    this.$emit('ok', values)
-                }
-            }
-
-        }
-    }
-</script>

+ 0 - 75
src/views/ticket/ticketsafeexecute/modules/Detail.vue

@@ -1,75 +0,0 @@
-<template>
-    <a-modal
-        :title="modalTitle"
-        :width="850"
-        :visible="visible"
-        :confirmLoading="confirmLoading"
-                @cancel="handleCancel"
-    >
-        <detail-list title="" :col="2">
-                                                                                                    <detail-list-item term="所属工作票执行单">{{ model.ticketExcuteId }}</detail-list-item>
-                                                                                                            <detail-list-item term="安措类别">{{ model.type }}</detail-list-item>
-                                                                                                            <detail-list-item term="安措名称">{{ model.name }}</detail-list-item>
-                                                                                                            <detail-list-item term="安措内容">{{ model.content }}</detail-list-item>
-                                                                                                            <detail-list-item term="危险等级">{{ model.dangerLevel }}</detail-list-item>
-                                                                                                            <detail-list-item term="来源1:签发单2:现场补充">{{ model.source }}</detail-list-item>
-                                                                                                            <detail-list-item term="状态1:待执行2:已执行3:已废弃">{{ model.status }}</detail-list-item>
-                                                                                                            <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-                                                                                                            <detail-list-item term="创建人">{{ model.createdUserId }}</detail-list-item>
-                                                                                                                                        <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-                                                        </detail-list>
-
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import DetailList from '@/components/tools/DetailList'
-    const DetailListItem = DetailList.Item
-
-    export default {
-        name: 'TicketSafeExecuteDetail',
-        components: {
-            DetailList,
-            DetailListItem
-        },
-        data () {
-            return {
-                confirmLoading: false,
-                mdl: {},
-                modalTitle: null,
-                visible: false,
-                // 下拉框map
-                                model: {
-                                                                                                                    'ticketExcuteId': null,
-                                                                                                'type': null,
-                                                                                                'name': null,
-                                                                                                'content': null,
-                                                                                                'dangerLevel': null,
-                                                                                                'source': null,
-                                                                                                'status': null,
-                                                                                                'remark': null,
-                                                                                                'createdUserId': null,
-                                                                                                                                            'updateTime': null,
-                                                            }
-            }
-        },
-        created () {
-            // 下拉框map
-                    },
-        methods: {
-            base (record) {
-                this.visible = true
-                this.modalTitle = '详情'
-                this.model = record
-            },
-            handleCancel () {
-                this.visible = false
-                this.confirmLoading = false
-            }
-
-        }
-    }
-</script>

+ 0 - 293
src/views/ticket/ticketsafeexecute/modules/TicketSafeExecuteSelectModal.vue

@@ -1,293 +0,0 @@
-<template>
-    <a-modal
-            :title="modalTitle"
-            :width="1000"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-            class="ant-modal2"
-            @cancel="handleCancel"
-    >
-        <a-card :bordered="false">
-            <div class="table-page-search-wrapper">
-                <a-form layout="inline">
-                    <a-row :gutter="48">
-                        <a-col :md="8" :sm="24">
-                            <a-form-item label="关键字">
-                                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :md="8 || 24" :sm="24">
-                <span class="table-page-search-submitButtons">
-                  <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-                </span>
-                        </a-col>
-                    </a-row>
-                </a-form>
-            </div>
-
-            <div class="table-operator">
-            </div>
-
-            <s-table
-                    ref="table"
-                    size="default"
-                    rowKey="id"
-                    :columns="columns"
-                    :data="loadData"
-                    :alert="options.alert"
-                    :customRow="options.customRow"
-                    :rowSelection="options.rowSelection"
-                    showPagination="auto"
-            >
-                <span slot="action" slot-scope="record1">
-                  <template>
-                    <a @click="handleView(record1)">查看</a>
-                  </template>
-                </span>
-            </s-table>
-            <detail ref="detailModal"/>
-        </a-card>
-        <template slot="footer">
-            <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">取消</a-button>
-            <a-button :loading="confirmLoading" type="primary" @click="handleSelect()">确定</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-    import { STable, Ellipsis } from '@/components'
-    import Detail from './Detail'
-    import { getTicketSafeExecutePage, fetchTicketSafeExecute } from '@/api/ticket/ticketsafeexecute'
-
-    export default {
-        name: 'TicketSafeExecuteSelectModal',
-        components: {
-            STable,
-            Ellipsis,
-            Detail
-        },
-        props: {
-            type: {
-                type: String,
-                default: 'radio'
-            },
-            selectedRowKey: {
-                type: Array,
-                default: () => {
-                    return []
-                }
-            },
-            selectedRow: {
-                type: Array,
-                default: () => {
-                    return []
-                }
-            }
-        },
-        data () {
-            return {
-                confirmLoading: false,
-                mdl: {},
-                modalTitle: null,
-                visible: false,
-                record: null,
-                // 查询参数
-                queryParam: {
-                },
-                extraQueryParam: {
-                },
-                // 表头
-                columns: [
-                    {
-                        title: '序号',
-                        dataIndex: 'index',
-                        customRender: (text, record, index) => {
-                            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-                        }
-                    },
-                                                                                                                                                {
-                                title: '所属工作票执行单',
-                                dataIndex: 'ticketExcuteId'
-                            },
-                                                                                                                                                        {
-                                title: '安措类别',
-                                dataIndex: 'type'
-                            },
-                                                                                                                                                        {
-                                title: '安措名称',
-                                dataIndex: 'name'
-                            },
-                                                                                                                                                        {
-                                title: '安措内容',
-                                dataIndex: 'content'
-                            },
-                                                                                                                                                        {
-                                title: '危险等级',
-                                dataIndex: 'dangerLevel'
-                            },
-                                                                                                                                                        {
-                                title: '来源1:签发单2:现场补充',
-                                dataIndex: 'source'
-                            },
-                                                                                                                                                        {
-                                title: '状态1:待执行2:已执行3:已废弃',
-                                dataIndex: 'status'
-                            },
-                                                                                                                                                        {
-                                title: '备注',
-                                dataIndex: 'remark'
-                            },
-                                                                                                                                                                                                    {
-                                title: '创建日期',
-                                dataIndex: 'createdTime'
-                            },
-                                                                                                                                        {
-                        title: '操作',
-                        key: 'action',
-                        width: '200px',
-                        align: 'center',
-                        scopedSlots: { customRender: 'action' }
-                    }
-                ],
-                // 下拉框map
-                                // 加载数据方法 必须为 Promise 对象
-                loadData: parameter => {
-                    parameter = {
-                        ...parameter,
-                        ...this.queryParam,
-                        ...this.extraQueryParam,
-                        dataScope: {
-                            sortBy: 'desc',
-                            sortName: 'update_time'
-                        }
-                    }
-                    return getTicketSafeExecutePage(Object.assign(parameter, this.queryParam))
-                            .then(res => {
-                                return res.data
-                            })
-                },
-                selectedRowKeys: [],
-                selectedRows: [],
-
-                options: {
-                    alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                    rowSelection: {
-                        selectedRowKeys: this.selectedRowKeys,
-                        onChange: this.onSelectChange
-                    }
-                },
-                optionAlertShow: false,
-                isCreated: false
-            }
-        },
-        created () {
-            // 下拉框map
-                    },
-        methods: {
-            tableOption () {
-                if (!this.optionAlertShow) {
-                    this.options = {
-                        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-                        rowSelection: {
-                            selectedRowKeys: this.selectedRowKeys,
-                            onChange: this.onSelectChange,
-                            type: this.type,
-                            getCheckboxProps: record => ({
-                                props: {
-                                    disabled: false,
-                                    name: record.id
-                                }
-                            })
-                        },
-                        customRow: (record) => {
-                            return {
-                                on: { // 事件
-                                    click: (event) => { // 点击行
-                                        // 选择对象
-                                        this.mySelect([record.id], [record])
-                                    },
-                                    dblclick: (event) => {
-                                        this.mySelect([record.id], [record])
-                                        this.handleSelect()
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    this.optionAlertShow = true
-                } else {
-                    this.options = {
-                        alert: false,
-                        rowSelection: null
-                    }
-                    this.optionAlertShow = false
-                }
-            },
-            handleView (record) {
-                fetchTicketSafeExecute({ id: record.id }).then(res => {
-                    const modal = this.$refs.detailModal
-                    modal.base(res.data)
-                })
-            },
-            handleOk () {
-                this.$refs.table.refresh()
-            },
-            onSelectChange (selectedRowKeys, selectedRows) {
-                this.selectedRowKeys = selectedRowKeys
-                this.selectedRows = selectedRows
-            },
-            resetSearchForm () {
-                this.queryParam = {
-                }
-                this.$refs.table.refresh(true)
-            },
-            base (record, queryParam = {}) {
-                this.visible = true
-                this.modalTitle = '选择信息'
-                this.extraQueryParam = queryParam
-                this.record = record
-                if (this.isCreated) {
-                    this.$refs.table.clearSelected()
-                    this.options.rowSelection.type = this.type
-                    this.handleOk()
-                } else {
-                    this.tableOption()
-                    this.isCreated = true
-                }
-            },
-            handleCancel () {
-                this.visible = false
-                this.confirmLoading = false
-            },
-            handleSelect () {
-                if (this.selectedRowKeys.length === 0) {
-                    this.$message.warn('请至少选择一项信息')
-                } else {
-                    this.confirmLoading = true
-                    this.$emit('selected', this.record, this.selectedRowKeys, this.selectedRows)
-                    this.confirmLoading = false
-                    this.visible = false
-                }
-            },
-            mySelect(selectedRowKeys, selectedRows) {
-                if (this.type === 'radio') {
-                    this.$refs.table.updateSelect(selectedRowKeys, selectedRows)
-                            this.$refs.table.rowSelection.onChange(selectedRowKeys, selectedRows)
-                } else {
-                    let mySelectedRowKeys
-                    let mySelectedRows = this.selectedRows.filter(item => item.id !== selectedRowKeys[0])
-                    if (this.selectedRowKeys.includes(selectedRowKeys[0])) {
-                        mySelectedRowKeys = this.selectedRowKeys.filter(item => item !== selectedRowKeys[0])
-                    } else {
-                        mySelectedRowKeys = [...selectedRowKeys, ...this.selectedRowKeys]
-                        mySelectedRows = [...mySelectedRows, ...selectedRows]
-                    }
-                    this.$refs.table.updateSelect(mySelectedRowKeys, mySelectedRows)
-                            this.$refs.table.rowSelection.onChange(mySelectedRowKeys, mySelectedRows)
-                }
-
-            }
-        }
-    }
-</script>

+ 0 - 12
src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -69,12 +69,8 @@
       <detail-repair-application-form-check ref="detailRepairApplicationFormCheckModal" @ok="handleOk"/>
       <detail-out-store ref="detailOutStoreModal" @ok="handleOk"/>
       <detail-spare-pick ref="detailSparePickModal" @ok="handleOk"/>
-      <sb-oil-detail ref="sbOilDetail" @ok="handleOk" />
-      <sb-oil-confirm-base-form ref="sbOilConfirmBaseForm" @ok="handleOk" />
       <sb-allocate-apply-detail ref="sbAllocateApplyDetail" @ok="handleOk" />
     </a-card>
-    <sb-oil-task ref="sbOilTask" v-if="sbOilTaskShow" :target-id="targetId" @back="back" />
-    <sb-oil-audit ref="sbOilAudit" v-if="sbOilAuditShow" :target-id="targetId" @back="back" />
     <sb-allocate-task-audit res="sbAllocateTaskAudit" v-if="sbAllocateTaskAuditShow" :target-id="targetId" @back="back" />
     <suplier-audit-form ref="supplierAuditModal" @ok="handleOk"/>
     <detail-audit-scrap ref="detailAuditScrapModal" @ok="handleOk"/>
@@ -89,10 +85,6 @@ import { PageView } from '@/layouts'
 import HeadInfo from '@/components/tools/HeadInfo'
 import { Radar, STable } from '@/components'
 import Detail from './modules/Detail'
-import SbOilTask from '@/views/sb/oil/SbOilTask'
-import SbOilAudit from '@/views/sb/oil/SbOilAudit'
-import SbOilConfirmBaseForm from '@/views/sb/oil/modules/ConfirmBaseForm'
-import SbOilDetail from '@/views/sb/oil/modules/Detail'
 import SbAllocateApplyDetail from '@/views/sb/allocate-apply/modules/Detail'
 import SbAllocateTaskAudit from '@/views/sb/allocate-task/SbAllocateTaskAudit'
 import { getWorkplaceBacklogUserPage, updateWorkplaceBacklog, fetchWorkplaceBacklogUserById } from '@/api/workplace/backlog'
@@ -120,17 +112,13 @@ export default {
     HeadInfo,
     Radar,
     Detail,
-    SbOilTask,
-    SbOilAudit,
     DetailRepairApplicationForm,
     DetailRepairApplicationFormRepair,
     DetailRepairApplicationFormCheck,
     DetailOutStore,
     DetailSparePick,
-    SbOilDetail,
     SbAllocateTaskAudit,
     SbAllocateApplyDetail,
-    SbOilConfirmBaseForm,
     SuplierAuditForm,
     DetailAuditScrap,
     DetailScrap