操作日志 档案盘点

src/views/archivesManage/archivesCheck/index.vue

@@ -1,14 +1,18 @@
 <template>
   <div class="app-container">
     <div class="head-container" style="padding:0 0 20px 0">
-      <el-button size="mini" class="iconfont icon-xinzengpandian-fanbai" @click="handleAdd">新增盘点</el-button>
+      <el-button size="mini" class="iconfont icon-xinzengpandian-fanbai" @click="handleAdd">新增</el-button>
       <el-button
         icon="el-icon-delete"
         size="mini"
-        style="margin:0 7px 0 7px"
-        :disabled="selections.length ? false : true "
+        style="margin:0 0 0 10px"
+        :disabled="!(selections.length && selections[0].checkState === '待执行') "
         @click="deleteVisible = true"
       >删除</el-button>
+      <el-button size="mini" icon="el-icon-tickets" :disabled="!(selections.length===1 && selections[0].checkState === '执行中') " @click="handleCalc">结算</el-button>
+      <el-select v-model="stateVal" class="filter-item" style="width: 90px;height:30px;margin:0 10px 0 10px">
+        <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
       <el-input
         v-model="keyWord"
         size="small"
@@ -18,7 +22,7 @@
         class="input-prepend filter-item"
         @keyup.enter.native="crud.toQuery"
       >
-        <el-select slot="prepend" v-model="cateSearch" style="width: 80px">
+        <el-select slot="prepend" v-model="cateSearch" style="width: 100px;">
           <el-option
             v-for="item in cateSearchOptions"
             :key="item.value"
@@ -121,9 +125,17 @@ export default {
       tableData: [],
       selections: [],
       keyWord: '',
-      cateSearch: '区域',
+      stateVal: 0,
+      stateOptions: [
+        { value: 0, label: '全部' },
+        { value: 1, label: '待执行' },
+        { value: 2, label: '执行中' },
+        { value: 3, label: '已执行' }
+      ],
+      cateSearch: 1,
       cateSearchOptions: [
-        { value: '选项1', label: '区域' }
+        { value: 1, label: '区域' },
+        { value: 2, label: '盘点单号' }
       ],
       deleteVisible: false
     }
@@ -139,6 +151,10 @@ export default {
     handleConfirm() {
       this.deleteVisible = false
     },
+    // 结算
+    handleCalc() {
+      console.log(this.selections)
+    },
     // 新增盘点
     handleAdd() {
       this.$refs.addCheckDom.tableData = data1.rows
@@ -202,4 +218,7 @@ export default {
 .svg-style{
   margin-right: 5px;
 }
+::v-deep .input-prepend .el-input__inner{
+padding-left: 94px;
+}
 </style>

src/views/system/logManage/operateLog/index.vue

@@ -68,8 +68,9 @@ export default {
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({
-      url: 'api/storage/initStorageLogList',
-      sort: ['update_time,desc'],
+      // url: 'api/storage/initStorageLogList',
+      // sort: ['update_time,desc'],
+      url: 'api/logs',
       // crudMethod: caseCrudMethod,
       optShow: {
         add: false,