提交修改

src/views/modules/result/record/lzresultrecordapp.vue

@@ -3,7 +3,7 @@
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 
       <el-form-item label="一级部门">
-        <el-select v-model="dataForm.department1" placeholder="请选择" @change="changeDepartment('2')">
+        <el-select v-model="dataForm.department1" @change="changeDepartment('2')">
           <el-option
             v-for="item in departmentList1"
             :key="item.departmentId"
@@ -13,7 +13,6 @@
         </el-select>
       </el-form-item>
 
-
       <el-form-item label="二级部门">
         <el-select v-model="dataForm.department2" placeholder="请选择" @change="changeDepartment('3')">
           <el-option
@@ -65,16 +64,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="审批状态">
+
-        <el-select v-model="dataForm.status" placeholder="请选择">
-          <el-option
-            v-for="item in stateList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
 
       <el-form-item label="备注">
         <el-input v-model="dataForm.remark" placeholder="备注" clearable></el-input>
@@ -89,57 +79,78 @@
     <div>
       <el-button type="primary" style="margin-bottom: 10px" @click="submitBt()">批量提交</el-button>
     </div>
-    <el-table
+
-      :data="dataList"
+    <el-tabs type="border-card" v-model="tabValue" @tab-click="tabChange">
-      border
+      <el-tab-pane label="审批中" name="0"></el-tab-pane>
-      v-loading="dataListLoading"
+      <el-tab-pane label="全部" name="1"></el-tab-pane>
-      @selection-change="selectionChangeHandle"
+      <el-tab-pane label="侍提交" name="3"></el-tab-pane>
-      :cell-style="cellStyle"
+      <el-tab-pane label="审批通过" name="4"></el-tab-pane>
-      style="width: 100%;"     >
+
-      <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+      <el-table
-      <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
+        :data="dataList"
-      <el-table-column prop="departmentName" header-align="center" align="center" label="部门名称"></el-table-column>
+        border
-      <el-table-column prop="staffName" header-align="center" align="center" label="姓名"></el-table-column>
+        v-loading="dataListLoading" border fit highlight-current-row
-      <el-table-column prop="monthTime" header-align="center" align="center" label="月份">
+        @selection-change="selectionChangeHandle"
-        <template slot-scope="scope">
+        :cell-style="cellStyle"
-          <div class="conatnt-name">
+
-            <span>{{ scope.row.monthTime | formaterDate }}</span>
+        style="width: 100%;"     >
-          </div>
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        </template>
+        <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
-      </el-table-column>
+        <el-table-column prop="departmentName" header-align="center" align="center" label="部门名称"></el-table-column>
-      <el-table-column prop="statusStr" header-align="center" align="center" label="状态">
+        <el-table-column prop="staffName" header-align="center" align="center" label="姓名"></el-table-column>
-        <template slot-scope="scope">
+        <el-table-column prop="monthTime" header-align="center" align="center" label="月份">
-          <div class="conatnt-name">
+          <template slot-scope="scope">
-            <span>{{ scope.row.status | getStatusStr }}</span>
+            <div class="conatnt-name">
-          </div>
+              <span>{{ scope.row.monthTime | formaterDate }}</span>
-        </template>
+            </div>
-      </el-table-column>
+          </template>
-      <el-table-column prop="lastScore" header-align="center" align="center" label="最后得分"></el-table-column>
+        </el-table-column>
-      <el-table-column prop="allScore" header-align="center" align="center" label="总分"></el-table-column>
+        <el-table-column prop="statusStr" header-align="center" align="center" label="状态">
-      <el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
+          <template slot-scope="scope">
-      <el-table-column
+            <div class="conatnt-name">
-        fixed="right"
+              <span>{{ scope.row.status | getStatusStr }}</span>
-        header-align="center"
+            </div>
-        align="center"
+          </template>
-        width="150"
+        </el-table-column>
-        label="操作">
+        <el-table-column prop="lastScore" header-align="center" align="center" label="最后得分"></el-table-column>
-        <template slot-scope="scope">
+        <el-table-column prop="allScore" header-align="center" align="center" label="总分"></el-table-column>
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id,3)">详情</el-button>
+        <el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
-        </template>
+        <el-table-column
-      </el-table-column>
+          fixed="right"
-    </el-table>
+          header-align="center"
-    <el-pagination
+          align="center"
-      @size-change="sizeChangeHandle"
+          width="150"
-      @current-change="currentChangeHandle"
+          label="操作">
-      :current-page="pageIndex"
+          <template slot-scope="scope">
-      :page-sizes="[10, 20, 50, 100]"
+            <el-button type="text" size="small" v-if="scope.row.status !== 1" @click="addOrUpdateHandle(scope.row.id,3)">详情</el-button>
-      :page-size="pageSize"
+            <el-button type="text" size="small" v-if="scope.row.status === 1" @click="addOrUpdateHandle(scope.row.id,3)">审批</el-button>
-      :total="totalPage"
+          </template>
-      layout="total, sizes, prev, pager, next, jumper">
+        </el-table-column>
-    </el-pagination>
+      </el-table>
+
+
+
+      <el-pagination
+        @size-change="sizeChangeHandle"
+        @current-change="currentChangeHandle"
+        :current-page="pageIndex"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageSize"
+        :total="totalPage"
+        layout="total, sizes, prev, pager, next, jumper">
+      </el-pagination>
+
+
+    </el-tabs>
+
+
+
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
   </div>
+
+
+
 </template>
 
 <script>
@@ -152,7 +163,6 @@ export default {
     formaterDate (val) {
       var date = new Date(val)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-      var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
       return date.getFullYear() + '-' + month
     },
     getStatusStr (status) {
@@ -161,7 +171,7 @@ export default {
       } else if (status === 1) {
         return '侍审批'
       } else if (status === 2) {
-        return '拒绝'
+        return '己审批'
       } else if (status === 3) {
         return '侍提交'
       } else if (status === 4) {
@@ -227,7 +237,7 @@ export default {
     AddOrUpdate
   },
   activated () {
-    this.getDataList()
+    this.getDataList(1)
   },
   methods: {
     async handleChangeData (data) {
@@ -292,14 +302,23 @@ export default {
         this.dataListLoading = false
       })
     },
+    tabChange (row) {
+      let status = row.name
+      if (row.name === '0') {
+        status = 1
+      } else if (row.name === '1') {
+        status = ''
+      }
+      this.getDataList(status)
+    },
     // 获取数据列表
-    getDataList () {
+    getDataList (status = this.dataForm.status) {
       apiGetResultRecordList({
         'page': this.pageIndex,
         'limit': this.pageSize,
         'monthBeginDate': this.dataForm.beginDate,
         'monthEndDate': this.dataForm.endDate,
-        'status': this.dataForm.status,
+        'status': status,
         'department1': this.dataForm.department1,
         'department2': this.dataForm.department2,
         'department3': this.dataForm.department3,
@@ -311,6 +330,11 @@ export default {
           this.dataList = data.page.list
           this.totalPage = data.page.totalCount
           this.departmentList1 = data.departmentList1
+          this.departmentList2 = data.departmentList2
+          this.departmentList3 = data.departmentList3
+          this.dataForm.department1 = data.department1
+          this.dataForm.department2 = data.department2
+          this.dataForm.department3 = data.department3
         } else {
           this.dataList = []
           this.totalPage = 0
@@ -325,8 +349,12 @@ export default {
       this.dataForm.endDate = data[1]
     },
     cellStyle ({row, column, rowIndex, columnIndex}) {
-      if (columnIndex === 5 && row.status === 3) {
+      if (columnIndex === 5 && row.status === 5) {
+        return 'color:red!important;'
+      } else if (columnIndex === 5 && row.status === 4) {
         return 'color:blue!important;'
+      } else if (columnIndex === 6 && row.type === 2) {
+        return 'font-weight:bold!important;'
       } else {
         return ''
       }

src/views/modules/result/record/recorddetail-add-or-update.vue

@@ -86,8 +86,10 @@ export default {
       callback()
     }
     var validPriority = async (rule, value, callback) => {
-      if (!value) {
+      if (value !== 0) {
-        callback(new Error('优先级不能为空'))
+        if (!value) {
+          callback(new Error('优先级不能为空'))
+        }
       }
       if (!/^(0|[1-9][0-9]*)$/.test(value)) {
         callback(new Error('请输入大于或等于0的整数'))
@@ -321,8 +323,14 @@ export default {
         }
       }
       if (this.auth.priority === 2) {
-        if (this.stringIsNull(this.dataForm.priority)) {
+        if (this.dataForm.priority !== 0) {
-          this.alertInfo('优先级不能为空')
+          if (!this.dataForm.priority) {
+            this.alertInfo('优先级不能为空')
+            return
+          }
+        }
+        if (!/^(0|[1-9][0-9]*)$/.test(this.dataForm.priority)) {
+          this.alertInfo('请输入大于或等于0的整数')
           return
         }
       }
@@ -343,7 +351,7 @@ export default {
         'scoreComment': Base64.encode(this.scoreCommentEditor.txt.html()),
         'recordId': this.recordResultId,
         'recordType': this.recordType,
-        'priority': this.priority
+        'priority': this.dataForm.priority
       }).then(res => {
         if (res && res.code === 0) {
           this.$message({

src/views/modules/result/record/recorddetail.vue

@@ -29,15 +29,22 @@
           </div>
 
           <div class="bottom" v-show="this.auth.approvel == 1">
-            <p><span style="cursor: pointer" @click="commitApprovalAddOrUpdate(1)">审批</span></p>
+            <p>
+              <span  @click="commitApprovalAddOrUpdate(1)">
+                <label :class="'label bg-order my_pointer'">审批</label>
+              </span>
+            </p>
           </div>
 
+
+
+
           <div class="bottom" v-show="this.auth.confirmCommit == 1">
-            <p><span style="cursor: pointer" @click="commitApprovalYes('你要确认得分吗？')">确认得分</span></p>
+            <p><span style="" @click="commitApprovalYes('你要确认得分吗？')">确认得分</span></p>
           </div>
 
           <div class="bottom" v-show="this.auth.reject == 1">
-            <p><span style="cursor: pointer" @click="commitApprovalAddOrUpdate(5)" >驳回</span></p>
+            <p><span  @click="commitApprovalAddOrUpdate(5)" ><label :class="'label bg-danger my_pointer'">驳回</label></span></p>
           </div>
         </div>
 
@@ -243,7 +250,7 @@ export default {
     },
     cellStyle ({row, column, rowIndex, columnIndex}) {
       if (rowIndex === this.yeJiCheckNum || rowIndex === this.yeJiCheckNum + this.wenHuaJiaZhiGuanNum + 1 || rowIndex === this.yeJiCheckNum + this.wenHuaJiaZhiGuanNum + this.lastResultNum + 2) {
-        return 'background:#FFC400;font-weight:bolder!important;'
+        return 'background:#DABBAF ;font-weight:bolder!important;'
       } else {
         return ''
       }
@@ -300,10 +307,6 @@ export default {
           return [1, 2]
         } else if (columnIndex === 1) {
           return [0, 0]
-        } else if (columnIndex === 2) {
-          return [1, 4]
-        } else if (columnIndex >= 3 && columnIndex <= 5) {
-          return [0, 0]
         }
       }
       if (rowIndex > this.yeJiCheckNum + 1 + this.wenHuaJiaZhiGuanNum + this.lastResultNum) {
@@ -566,5 +569,103 @@ export default {
   left: 146px;
   font-size: 12px;
 }
+.label{
+  display: inline-block;
+  padding: 3px 5px;
+  font-size: 75%;
+  font-weight: bold;
+  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
+  line-height: 1;
+  color: #fff;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: .25em;
+}
+// label状态
+.bg-info {
+  color: #dcf2f8;
+  background-color: #23b7e5;
+}
+.bg-order {
+  color: #dcf2f8;
+  background: #1f07d2;
+}
+.bg-type{
+  color: #dcf2f8;
+  background-color: #4e3692;
+}
+.bg-success {
+  color: #c6efd0;
+  background-color: #27c24c;
+}
+.bg-danger {
+  color: #ffffff;
+  background-color: #f05050;
+}
+.bg-gray {
+  color: #ffffff;
+  background-color: #666;
+}
+.tableTitle{
+  display:flex;
+  justify-content:space-between;
+  align-items:flex-end;
+  background-color: #D9EDF7;
+  border: 2px solid #BCE8F1;
+  color: #31708f;
+}
+//图标
+.icon-img{
+  display:inline-block;
+  vertical-align:-2px;
+  width:12px;
+  height:14px;
+  background-position:center center;
+  background-size:12px 14px;
+}
+.icon-through{
+  background-image:url("~@/assets/img/icon/icon-through.png");
+}
+.icon-audit-success{
+  background-image:url("~@/assets/img/icon/icon-audit-success.png");
+}
+.icon-audit-fail{
+  background-image:url("~@/assets/img/icon/icon-audit-fail.png");
+}
+.icon-confirm-good{
+  background-image:url("~@/assets/img/icon/icon-confirm-goods.png")
+}
+.icon-returnMoney{
+  background-image:url("~@/assets/img/icon/icon-returnMoney.png")
+}
+.icon-returnGood{
+  background-image:url("~@/assets/img/login/bbb.png")
+}
+.thumb-wrapper {
+  padding: 2px;
+  border: 1px solid #dee5e7;
+}
+.underline:hover{
+  cursor:pointer;
+  text-decoration:underline;
+}
+.red{
+  color:red;
+}
+.blue{
+  color:blue;
+}
+b{
+  font-size:14px;
+}
+.page {
+  text-align: right;
+  padding: 15px;
+}
 
+
+.my_pointer{
+cursor: pointer
+}
 </style>