档案盘点

src/views/archivesManage/archivesCheck/index.vue

@@ -70,7 +70,7 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <div class="dialog-delt">
-          <p><span>确定删除当前盘点任务？</span></p>
+          <p><span style="font-size:16px">确定删除当前盘点任务？</span></p>
           <p class="delt-tip"><span>提示：确定删除后,该数据将无法找回!</span></p>
         </div>
         <div slot="footer" class="dialog-footer">
@@ -139,7 +139,9 @@ export default {
     handleConfirm() {
       this.deleteVisible = false
     },
+    // 新增盘点
     handleAdd() {
+      this.$refs.addCheckDom.tableData = data1.rows
       this.$refs.addCheckDom.addFormVisible = true
     },
     handleClose() {

src/views/archivesManage/archivesCheck/module/addCheck.vue

@@ -17,6 +17,8 @@
               multiple
               placeholder="请选择"
               style="width:245px;height:30px"
+              :limit="2"
+              :limit-text="count => `+${count}`"
             />
           </el-form-item>
           <el-form-item label="选择门类" prop="category" class="down-select">
@@ -29,7 +31,6 @@
               placeholder="请选择"
               :collapse-tags="showTags"
               @change="selectChange"
-              @remove-tag="removeTag"
             >
               <el-option
                 v-for="item in category"
@@ -41,20 +42,28 @@
           </el-form-item>
           <el-button type="primary" size="mini" style="margin:0 0 0 10px;height:30px" @click="handleBuild">生成盘点单</el-button>
         </el-form>
-        <el-table :data="gridData" style="height:341px">
+        <el-table :data="tableData" height="calc(100vh - 595px)" :cell-class-name="cell">
           <el-table-column type="index" align="center" label="序号" width="60" />
-          <el-table-column prop="fieldCnName" align="center" label="状态" width="80" />
-          <el-table-column prop="fieldCnName" align="center" label="所属门类" width="100" />
-          <el-table-column prop="fieldCnName" align="center" label="子条目数" width="100" />
-          <el-table-column prop="fieldCnName" align="center" label="全宗号" width="100" />
-          <el-table-column prop="fieldName" align="center" label="档号" width="180" />
-          <el-table-column prop="fieldCnName" align="center" label="部门名称" width="100" />
-          <el-table-column label="题名" align="center" width="180" />
-          <el-table-column label="年度" align="center" width="85" />
-          <el-table-column label="保管期限" align="center" width="120" />
-          <el-table-column label="密级" align="center" width="85" />
-          <el-table-column label="存放位置" align="center" width="150" />
+          <el-table-column prop="checkState" align="center" label="状态" width="120">
+            <template slot-scope="scope">
+              <!-- 已执行 / 待执行/执行中 -->
+              <span class="clear">{{ scope.row.checkState }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="" align="center" label="门类级别" width="100" />
+          <el-table-column prop="" align="center" label="门类名称" width="120" />
+          <el-table-column prop="" align="center" label="全宗号" width="100" />
+          <el-table-column prop="" align="center" label="档号" width="180" />
+          <el-table-column prop="" align="center" label="归档年度" width="100" />
+          <el-table-column prop="" label="题名" align="center" width="180" />
+          <el-table-column prop="" label="保密程度" align="center" width="85" />
+          <el-table-column prop="" label="部门" align="center" width="120" />
+          <el-table-column prop="" label="盒名称" align="center" width="85" />
+          <el-table-column prop="" label="所在位置" align="center" width="150" />
+          <el-table-column prop="" label="创建时间" align="center" width="150" />
         </el-table>
+        <!-- 分页器 记得加上!!!!!!!!!!!!!!!!!!!!!! -->
+        <!-- !!!!!!!!!!!!!!!!!!!!!!!! -->
         <div slot="footer" class="dialog-footer">
           <el-button @click="handleSave">保存</el-button>
         </div>
@@ -123,7 +132,7 @@ export default {
   data() {
     return {
       menusIds: [],
-      gridData: [],
+      tableData: [],
       checkForm: {},
       addFormVisible: false,
       selectAreaValue: [],
@@ -172,13 +181,15 @@ export default {
       }
       this.oldCategory = this.categoryValue
     },
-    // 取消全选
-    removeTag(val) {
-      console.log(val, '-------')
-      if (val === 0) {
-        this.categoryValue = []
+    // 单元格样式
+    cell({ row, columnIndex }) {
+      if (row.checkState === '已执行' && columnIndex === 1) {
+        return 'have-clear'
+      } else if (row.checkState === '待执行' && columnIndex === 1) {
+        return 'fail-clear'
+      } else if (row.checkState === '执行中' && columnIndex === 1) {
+        return 'no-clear'
       }
-      this.$forceUpdate()
     }
 
   }
@@ -186,6 +197,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import '~@/assets/styles/lend-manage.scss';
+
 .el-form{
     display: flex;
 }
@@ -211,4 +224,26 @@ export default {
 ::v-deep .el-input__inner{
   height: 30px !important;
 }
+// 树形选择器
+::v-deep .vue-treeselect--has-value .vue-treeselect__multi-value{
+  margin-bottom: 0;
+}
+::v-deep .vue-treeselect__multi-value-item-container{
+  padding-top: 2px;
+  line-height: 20px;
+}
+
+::v-deep .el-dialog .el-form .vue-treeselect__control{
+  line-height: 17px;
+}
+::v-deep .vue-treeselect__limit-tip{
+  background: #13439E;
+  border-radius: 3px;
+  margin: 2px;
+  padding: 0 3px;
+  .vue-treeselect__limit-tip-text{
+    padding: 2px 2px;
+    color: #fff;
+  }
+}
 </style>

src/views/archivesManage/archivesCheck/module/checkDetail.vue

@@ -27,12 +27,13 @@
           </el-table-column>
           <el-table-column prop="" align="center" label="子条数目" width="90" />
           <el-table-column prop="" align="center" label="门类级别" width="90" />
+          <el-table-column prop="" align="center" label="门类名称" width="90" />
           <el-table-column prop="" align="center" label="全宗号" width="90" />
           <el-table-column prop="" align="center" label="档号" width="180" />
           <el-table-column prop="" align="center" label="归档年度" width="90" />
           <el-table-column prop="" align="center" label="题名" width="180" />
           <el-table-column prop="" align="center" label="保密程度" width="90" />
-          <el-table-column prop="" align="center" label="部门名称" width="90" />
+          <el-table-column prop="" align="center" label="部门" width="90" />
           <el-table-column prop="" align="center" label="盒名称" width="90" />
           <el-table-column prop="containPath" align="center" label="所在位置" width="220" />
           <el-table-column prop="CreateTime" align="center" label="创建时间" width="150" />