修改需求

src/main.js

@@ -27,7 +27,7 @@ const checkBtn = {
         { id: 2, name: '二级' },
         { id: 1, name: '一级' },
         { id: 0, name: '一般' },
-        { id: -1, name: '未定义' }
+        { id: -1, name: '未定级' }
       ]
       return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
     },

src/views/collect/collect0_DiaEdit.vue

@@ -78,6 +78,7 @@
             style="width: 100%"
           >
             <el-option label="请选择" value=""></el-option>
+            <el-option label="资料" :value="4"></el-option>
             <el-option label="三级" :value="3"></el-option>
             <el-option label="二级" :value="2"></el-option>
             <el-option label="一级" :value="1"></el-option>

src/views/collect/collect1_add.vue

@@ -24,7 +24,7 @@
             <el-form-item label="提用编号：" prop="number" style="width: 45%">
               <el-input v-model="fromData.number" disabled></el-input>
             </el-form-item>
-            <el-form-item label="登记人员：" prop="people" style="width: 45%">
+            <el-form-item label="登记人：" prop="people" style="width: 45%">
               <el-input v-model="fromData.people" disabled></el-input>
             </el-form-item>
           </div>

src/views/collect/collect1_audit.vue

@@ -18,7 +18,7 @@
             <span>{{myData.num}}</span>
           </div>
           <div>
-            <h4>登记人员：</h4>
+            <h4>登记人：</h4>
             <span>{{myData.realName}}</span>
           </div>
           <div>

src/views/collect/collect2_add.vue

@@ -24,7 +24,7 @@
             <el-form-item label="注销编号：" prop="number" style="width: 45%">
               <el-input v-model="fromData.number" disabled></el-input>
             </el-form-item>
-            <el-form-item label="登记人员：" prop="people" style="width: 45%">
+            <el-form-item label="登记人：" prop="people" style="width: 45%">
               <el-input v-model="fromData.people" disabled></el-input>
             </el-form-item>
           </div>

src/views/collect/collect2_audit.vue

@@ -18,7 +18,7 @@
             <span>{{myData.num}}</span>
           </div>
           <div>
-            <h4>登记人员：</h4>
+            <h4>登记人：</h4>
             <span>{{myData.realName}}</span>
           </div>
           <div style="width:100%">

src/views/collect/collect3.vue

@@ -52,7 +52,7 @@
               </el-table-column>
               <el-table-column prop="num" label="总登记号" width="280" :resizable="false">
               </el-table-column>
-              <el-table-column prop="realName" label="编辑登记人" width="200" :resizable="false">
+              <el-table-column prop="realName" label="登记人" width="200" :resizable="false">
               </el-table-column>
               <el-table-column prop="updateTime" label="编辑日期" width="200" :resizable="false">
               </el-table-column>

src/views/collect/collect3_audit.vue

@@ -15,7 +15,7 @@
         <div class="con_top">
           <div><span>征集品名称：</span>{{myObj.name}}</div>
           <div><span>总登记号：</span>{{myObj.num}}</div>
-          <div><span>编辑登记人：</span>{{myObj.realName}}</div>
+          <div><span>登记人：</span>{{myObj.realName}}</div>
           <div><span>编辑时间：</span>{{myObj.updateTime}}</div>
         </div>
         <div class="con_edit">

src/views/collect/collect3_look.vue

@@ -18,7 +18,7 @@
             <div><span>总登记号：</span>{{myObj.num}}</div>
           </div>
         <div class="row">
-          <div><span>编辑登记人：</span>{{myObj.realName}}</div>
+          <div><span>登记人：</span>{{myObj.realName}}</div>
           <div><span>编辑时间：</span>{{myObj.updateTime}}</div>
         </div>
         <div class="row">

src/views/holding/holding0.vue

@@ -68,7 +68,7 @@
               </el-table-column>
               <el-table-column prop="unit" label="单位或个人" :resizable="false">
               </el-table-column>
-              <el-table-column prop="realName" label="登记人员" width="110" :resizable="false">
+              <el-table-column prop="realName" label="登记人" width="110" :resizable="false">
               </el-table-column>
               <el-table-column prop="createTime" label="创建日期" width="200" :resizable="false">
               </el-table-column>

src/views/holding/holding0_DiaEdit.vue

@@ -78,6 +78,7 @@
             style="width: 100%"
           >
             <el-option label="请选择" value=""></el-option>
+            <el-option label="资料" :value="4"></el-option>
             <el-option label="三级" :value="3"></el-option>
             <el-option label="二级" :value="2"></el-option>
             <el-option label="一级" :value="1"></el-option>

src/views/holding/holding0_Dialog.vue

@@ -78,6 +78,7 @@
             style="width: 100%"
           >
             <el-option label="请选择" :value='null'></el-option>
+            <el-option label="资料" :value="4"></el-option>
             <el-option label="三级" :value="3"></el-option>
             <el-option label="二级" :value="2"></el-option>
             <el-option label="一级" :value="1"></el-option>

src/views/holding/holding0_add.vue

@@ -24,7 +24,7 @@
             <el-form-item label="登记编号" prop="number" style="width: 45%">
               <el-input v-model="fromData.number" disabled></el-input>
             </el-form-item>
-            <el-form-item label="登记人员" prop="people" style="width: 45%">
+            <el-form-item label="登记人" prop="people" style="width: 45%">
               <el-input v-model="fromData.people" disabled></el-input>
             </el-form-item>
           </div>

src/views/holding/holding0_audit.vue

@@ -18,7 +18,7 @@
             <span>{{myData.num}}</span>
           </div>
           <div>
-            <h4>登记人员：</h4>
+            <h4>登记人：</h4>
             <span>{{myData.realName}}</span>
           </div>
           <div>

src/views/holding/holding0_result.vue

@@ -18,7 +18,7 @@
             <span>{{mydata.num}}</span>
           </div>
           <div>
-            <h4>登记人员：</h4>
+            <h4>登记人：</h4>
             <span>{{mydata.realName}}</span>
           </div>
           <div>

src/views/holding/holding1_add.vue

@@ -24,7 +24,7 @@
             <el-form-item label="入库编号：" prop="number" style="width: 45%">
               <el-input v-model="fromData.number" disabled></el-input>
             </el-form-item>
-            <el-form-item label="登记人员：" prop="people" style="width: 45%">
+            <el-form-item label="登记人：" prop="people" style="width: 45%">
               <el-input v-model="fromData.people" disabled></el-input>
             </el-form-item>
           </div>

src/views/holding/holding1_audit.vue

@@ -18,7 +18,7 @@
             <span>{{myData.num}}</span>
           </div>
           <div>
-            <h4>登记人员：</h4>
+            <h4>登记人：</h4>
             <span>{{myData.realName}}</span>
           </div>
         </div>

src/views/holding/holding2_add.vue

@@ -24,7 +24,7 @@
             <el-form-item label="出库编号：" prop="number" style="width: 45%">
               <el-input v-model="fromData.number" disabled></el-input>
             </el-form-item>
-            <el-form-item label="登记人员：" prop="people" style="width: 45%">
+            <el-form-item label="登记人：" prop="people" style="width: 45%">
               <el-input v-model="fromData.people" disabled></el-input>
             </el-form-item>
           </div>
@@ -253,7 +253,7 @@ export default {
         type: 'warning'
       }).then(async () => {
         if (this.tableData.length === 0) return this.$message.warning('至少添加一条藏品信息')
-        if (this.tableData.some(v => v.outPath === '')) return this.$message.warning('出库位置不能为空')
+        // if (this.tableData.some(v => v.outPath === '')) return this.$message.warning('出库位置不能为空')
         if (this.fromData.textarea.trim() === '') return this.$message.warning('出库说明不能为空')
         if (this.fromData.textarea.length > 255) return this.$message.warning('出库说明不能超过255个字')
         // 发请求
@@ -274,7 +274,7 @@ export default {
     // 点击提交
     submit () {
       if (this.tableData.length === 0) return this.$message.warning('至少添加一条藏品信息')
-      if (this.tableData.some(v => v.outPath === '')) return this.$message.warning('出库位置不能为空')
+      // if (this.tableData.some(v => v.outPath === '')) return this.$message.warning('出库位置不能为空')
       if (this.fromData.textarea.trim() === '') return this.$message.warning('出库说明不能为空')
       if (this.fromData.textarea.length > 255) return this.$message.warning('出库说明不能超过255个字')
       this.$confirm('是否确认提交?', '提示', {

src/views/holding/holding2_audit.vue

@@ -18,7 +18,7 @@
             <span>{{myData.num}}</span>
           </div>
           <div>
-            <h4>登记人员：</h4>
+            <h4>登记人：</h4>
             <span>{{myData.realName}}</span>
           </div>
           <div>

src/views/holding/holding3_DiaEdit.vue

@@ -78,6 +78,7 @@
             style="width: 100%"
           >
             <el-option label="请选择" value=""></el-option>
+            <el-option label="资料" :value="4"></el-option>
             <el-option label="三级" :value="3"></el-option>
             <el-option label="二级" :value="2"></el-option>
             <el-option label="一级" :value="1"></el-option>

src/views/holding/holding3_look.vue

@@ -545,17 +545,23 @@
         ></el-table-column>
         <el-table-column
           :resizable="false"
+          property="userName"
+          label="登记人"
+          width="130"
+        ></el-table-column>
+        <el-table-column
+          :resizable="false"
           property="tempType"
           label="业务类型"
-          width="150"
+          width="130"
         ></el-table-column>
         <el-table-column
           property="updateTime"
           label="完成时间"
-          width="220"
+          width="200"
           :resizable="false"
         ></el-table-column>
-        <el-table-column label="操作" width="120" :resizable="false">
+        <el-table-column label="操作" width="100" :resizable="false">
           <template #default="{ row }">
             <el-button type="text" @click="lookRZ(row)">查 看</el-button>
           </template>

src/views/holding/holding4.vue

@@ -52,7 +52,7 @@
               </el-table-column>
               <el-table-column prop="num" label="总登记号"  :resizable="false">
               </el-table-column>
-              <el-table-column prop="realName" label="编辑登记人" width="150" :resizable="false">
+              <el-table-column prop="realName" label="登记人" width="150" :resizable="false">
               </el-table-column>
               <el-table-column prop="updateTime" label="编辑日期" width="200" :resizable="false">
               </el-table-column>

src/views/holding/holding4_audit.vue

@@ -15,7 +15,7 @@
         <div class="con_top">
           <div><span>藏品名称：</span>{{myObj.name}}</div>
           <div><span>总登记号：</span>{{myObj.num}}</div>
-          <div><span>编辑登记人：</span>{{myObj.realName}}</div>
+          <div><span>登记人：</span>{{myObj.realName}}</div>
           <div><span>编辑时间：</span>{{myObj.updateTime}}</div>
         </div>
         <div class="con_edit">

src/views/holding/holding4_look.vue

@@ -18,7 +18,7 @@
             <div><span>总登记号：</span>{{myObj.num}}</div>
           </div>
         <div class="row">
-          <div><span>编辑登记人：</span>{{myObj.realName}}</div>
+          <div><span>登记人：</span>{{myObj.realName}}</div>
           <div><span>编辑时间：</span>{{myObj.updateTime}}</div>
         </div>
         <div class="row">

src/views/holding/holding5_add.vue

@@ -24,7 +24,7 @@
             <el-form-item label="注销编号：" prop="number" style="width: 45%">
               <el-input v-model="fromData.number" disabled></el-input>
             </el-form-item>
-            <el-form-item label="登记人员：" prop="people" style="width: 45%">
+            <el-form-item label="登记人：" prop="people" style="width: 45%">
               <el-input v-model="fromData.people" disabled></el-input>
             </el-form-item>
           </div>

src/views/holding/holding5_audit.vue

@@ -18,7 +18,7 @@
             <span>{{myData.num}}</span>
           </div>
           <div>
-            <h4>登记人员：</h4>
+            <h4>登记人：</h4>
             <span>{{myData.realName}}</span>
           </div>
           <div style="width:100%">

src/views/layout/index.vue

@@ -329,13 +329,14 @@ export default {
     .box {
       position: relative;
       cursor: pointer;
-      margin: 0 30px;
+      margin: 0 10px;
       a{
+        text-align: center;
+        width: 94px;
         color: #fff;
         display: block;
         height: 68px;
         line-height: 68px;
-        padding: 0 15px;
       }
       ul {
         z-index: 9999;

src/views/statistics/statistics0.vue

@@ -17,7 +17,7 @@
             <el-button type="danger" @click="delOne" v-if="userLimits.del">删除</el-button>
           </div>
           <div class="box" v-for="(item, index) in allList" :key="item.id">
-            <div class="title" :style="arrowsShow === index?'background-color: #f2f2f2;':''">
+            <div class="title" :style="arrowsShow === index?'background-color: #ddecff;':''">
               <i
                 :class="
                   arrowsShow === index
@@ -46,16 +46,17 @@
           <div class="title" v-show="towList.name">
             <b>{{ towList.name }}</b>
             <span>仓库编号：{{ towList.num }}</span>
+            <div class="iJihe">
             <i class="el-icon-plus" @click="addThree" v-if="userLimits.edit"></i>
             <i class="el-icon-edit" @click="editTow" v-if="userLimits.edit"></i>
             <i class="el-icon-delete" @click="delTow" v-if="userLimits.del"></i>
+            </div>
           </div>
           <!-- 表格 -->
           <div class="table" v-if="towList.name">
             <el-table
-              :header-cell-style="{ background: '#d8dff0', color: '#404040' }"
+              :header-cell-style="{ height: '55px', color: '#404040' }"
               :data="tableData"
-              border
               style="width: 100%"
             >
               <el-table-column
@@ -468,21 +469,23 @@ export default {
     display: flex;
     background-color: #fff;
     margin: 0 20px 40px;
-    padding: 30px 60px 0;
+    // padding: 30px 60px 0;
     .conten_left {
       width: 380px;
-      height: 650px;
-      border: 1px solid #ccc;
-      margin-right: 30px;
+      height: 100%;
+      border-right: 1px solid #ccc;
       .btn {
+        padding-left: 30px;
         display: flex;
-        justify-content: center;
+        justify-content: left;
         align-items: center;
         height: 80px;
       }
       .title {
+        padding-left: 10px;
         span {
           cursor: pointer;
+          margin-left: 10px;
         }
         position: relative;
         display: flex;
@@ -492,7 +495,7 @@ export default {
         color: black;
         & > i {
           cursor: pointer;
-          font-size: 30px;
+          font-size: 24px;
         }
         & > i:nth-of-type(2) {
           right: 35px;
@@ -505,17 +508,14 @@ export default {
           float: right;
           margin: 0 10px;
           font-size: 24px;
-          color: #a5acb3;
+          color: #333;
         }
       }
       .area {
         color: black;
         li {
           cursor: pointer;
-          // width: 100%;
-          // height: 33px;
-          // line-height: 33px;
-          margin-left: 50px;
+          margin: 10px 50px 0;
         }
         li:hover {
           color: #3E5EB3;
@@ -536,9 +536,10 @@ export default {
       }
       position: relative;
       .table {
+        margin:0 20px;
         /deep/.el-table__body-wrapper{
           max-height: 524px;
-          max-width: 1150px !important;
+          max-width: 1303px !important;
           overflow-y: auto;
         }
         i {
@@ -555,10 +556,11 @@ export default {
         bottom: 20px;
       }
       flex: 1;
-      height: 650px;
-      border: 1px solid #ccc;
+      height: 100%;
       .title {
-        height: 75px;
+        position: relative;
+        border-bottom: 1px solid #ccc;
+        height: 81px;
         color: black;
         display: flex;
         align-items: center;
@@ -569,10 +571,16 @@ export default {
         & > span {
           margin-right: 20px;
         }
-        & > i {
-          cursor: pointer;
-          font-size: 24px;
-          margin: 0 10px;
+        .iJihe{
+          position: absolute;
+          right: 20px;
+          top: 50%;
+          transform: translateY(-50%);
+          & > i {
+            cursor: pointer;
+            font-size: 24px;
+            margin: 0 10px;
+          }
         }
       }
     }

src/views/statistics/statistics2.vue

@@ -52,7 +52,7 @@
               </el-table-column>
               <el-table-column prop="num" label="总登记号" width="280" :resizable="false">
               </el-table-column>
-              <el-table-column prop="realName" label="编辑登记人" width="200" :resizable="false">
+              <el-table-column prop="realName" label="登记人" width="200" :resizable="false">
               </el-table-column>
               <el-table-column prop="updateTime" label="编辑日期" width="200" :resizable="false">
               </el-table-column>