修复bug

src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 // export const baseURL = '666初始地址'
 const service = axios.create({
-  baseURL: 'http://192.168.0.135:8006',
-  // baseURL: '',
+  // baseURL: 'http://192.168.0.135:8006',
+  baseURL: '',
   timeout: 5000
 })
 

src/views/collect/collect0.vue

@@ -35,7 +35,6 @@
             </el-select>
             <span>搜索：</span>
                 <el-select v-model="mydata.searchType" placeholder="请选择" style="width:108px">
-                  <el-option label="全部" value=""></el-option>
                   <el-option label="藏品名称" value="name"></el-option>
                   <el-option label="藏品年代" value="age"></el-option>
                   <el-option label="藏品质地" value="texture"></el-option>
@@ -172,7 +171,7 @@ export default {
       baseURL: '',
       // 请求藏品总账参数
       mydata: {
-        searchType: '', // 搜索类型， name:名称， age:年代， texture：质地
+        searchType: 'name', // 搜索类型， name:名称， age:年代， texture：质地
         goodsTypeId: '', // 藏品类型id
         pageNum: 1, // 起始页码，默认1为第一页
         pageSize: 10, // 每页数量

src/views/collect/collect1.vue

@@ -276,7 +276,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1]
+      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +

src/views/collect/collect1_look.vue

@@ -26,18 +26,17 @@
             <span>{{myData.type}}</span>
           </div>
           <div>
-            <h4>出库说明：</h4>
-            <span>{{myData.description}}</span>
-          </div>
-          <div>
             <h4>审核结果：</h4>
             <span>{{myData.status}}</span>
           </div>
-          <div>
-            <h4>审核说明：</h4>
-            <span>{{myData.reason}}</span>
-          </div>
         </div>
+                          <div class="explain">
+            <p><span>出库说明：</span>{{ myData.description }}</p>
+          </div>
+          <div class="explain">
+            <p><span>审核说明：</span>{{ myData.reason }}</p>
+          </div>
+
         <!-- 表格 -->
         <div class="table">
           <div class="title">
@@ -246,7 +245,7 @@ export default {
     .explain {
       border: 1px solid #ccc;
       color: black;
-      padding: 30px 150px 30px 20px;
+      padding: 15px;
       display: flex;
       flex-wrap: wrap;
       span {
@@ -254,7 +253,7 @@ export default {
       }
     }
     .table {
-      max-height: 420px;
+      max-height: 360px;
       overflow: auto;
       .smimg {
         border: 3px solid #ccc;

src/views/collect/collect2.vue

@@ -263,7 +263,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1]
+      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +

src/views/collect/collect2_look.vue

@@ -22,16 +22,18 @@
             <span>{{myData.realName}}</span>
           </div>
           <div>
-            <h4>注销说明：</h4>
-            <span>{{myData.description}}</span>
-          </div>
-          <div>
             <h4>审核结果：</h4>
             <span>{{myData.status}}</span>
           </div>
         </div>
         <div class="explain">
           <p>
+            <span>注销说明：</span
+            >{{myData.description}}
+          </p>
+        </div>
+        <div class="explain">
+          <p>
             <span>审核说明：</span
             >{{myData.reason}}
           </p>
@@ -198,13 +200,13 @@ export default {
         display: flex;
         align-items: center;
         border: 1px solid #ccc;
-        width: 50%;
+        width: 33.33%;
       }
     }
     .explain {
       border: 1px solid #ccc;
       color: black;
-      padding: 30px 150px 30px 20px;
+      padding: 15px;
       display: flex;
       flex-wrap: wrap;
       span {
@@ -212,7 +214,7 @@ export default {
       }
     }
     .table {
-      max-height: 420px;
+      max-height: 380px;
       overflow: auto;
       .smimg {
         border: 3px solid #ccc;

src/views/holding/holding0.vue

@@ -299,7 +299,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1]
+      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value =

src/views/holding/holding0_DiaEdit.vue

@@ -504,6 +504,10 @@ export default {
       this.ruleForm.registerId = this.registerId
       try {
         await this.$refs.ruleForm.validate()
+        if (this.ruleForm.goodsTypeId === '') return this.$message.warning('文物类别没有选择！')
+        if (this.ruleForm.level === '') return this.$message.warning('文物级别没有选择！')
+        if (this.ruleForm.textureType === '') return this.$message.warning('文物质地没有选择！')
+        if (this.ruleForm.integrity === '') return this.$message.warning('完残程度没有选择！')
         // console.log(this.ruleForm)
         this.ruleForm.amount = Number(this.ruleForm.amount)
         await holdingAdd(this.ruleForm)

src/views/holding/holding0_Dialog.vue

@@ -505,6 +505,10 @@ export default {
       this.ruleForm.registerId = this.registerId
       try {
         await this.$refs.ruleForm.validate()
+        if (this.ruleForm.goodsTypeId === '') return this.$message.warning('文物类别没有选择！')
+        if (this.ruleForm.level === '') return this.$message.warning('文物级别没有选择！')
+        if (this.ruleForm.textureType === '') return this.$message.warning('文物质地没有选择！')
+        if (this.ruleForm.integrity === '') return this.$message.warning('完残程度没有选择！')
         // console.log(this.ruleForm)
         this.ruleForm.amount = Number(this.ruleForm.amount)
         this.ruleForm.dirCode = this.dirCode

src/views/holding/holding0_result.vue

@@ -203,7 +203,7 @@ export default {
     .explain {
       border: 1px solid #ccc;
       color: black;
-      padding: 30px 150px 30px 20px;
+      padding: 15px;
       display: flex;
       flex-wrap: wrap;
       span {
@@ -211,7 +211,7 @@ export default {
       }
     }
     .table {
-      max-height: 288px;
+      max-height: 325px;
       overflow: auto;
       .smimg {
         border: 3px solid #ccc;

src/views/holding/holding1.vue

@@ -264,7 +264,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1]
+      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +

src/views/holding/holding1_look.vue

@@ -22,16 +22,18 @@
             <span>{{myData.realName}}</span>
           </div>
           <div>
-            <h4>入库说明：</h4>
-            <span>{{myData.description}}</span>
-          </div>
-          <div>
             <h4>审核结果：</h4>
             <span>{{myData.status}}</span>
           </div>
         </div>
         <div class="explain">
           <p>
+            <span>入库说明：</span
+            >{{myData.description}}
+          </p>
+        </div>
+        <div class="explain">
+          <p>
             <span>审核说明：</span
             >{{myData.reason}}
           </p>
@@ -199,13 +201,13 @@ export default {
         display: flex;
         align-items: center;
         border: 1px solid #ccc;
-        width: 50%;
+        width: 33.33%;
       }
     }
     .explain {
       border: 1px solid #ccc;
       color: black;
-      padding: 30px 150px 30px 20px;
+      padding: 15px;
       display: flex;
       flex-wrap: wrap;
       span {
@@ -221,7 +223,7 @@ export default {
       /deep/.el-input__suffix-inner{
         opacity: 0;
       }
-      max-height: 420px;
+      max-height: 380px;
       overflow: auto;
       .smimg {
         border: 3px solid #ccc;

src/views/holding/holding2.vue

@@ -276,7 +276,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1]
+      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +

src/views/holding/holding2_look.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div class="holding0_result">
-    <TabList :ind='2'/>
+    <TabList :ind="2" />
     <div class="right">
       <div class="top">
         <el-breadcrumb separator="/">
@@ -15,33 +15,36 @@
         <div class="info">
           <div>
             <h4>出库编号：</h4>
-            <span>{{myData.num}}</span>
+            <span>{{ myData.num }}</span>
           </div>
           <div>
             <h4>出库人员：</h4>
-            <span>{{myData.realName}}</span>
+            <span>{{ myData.realName }}</span>
           </div>
           <div>
             <h4>出库类型：</h4>
-            <span>{{myData.type}}</span>
-          </div>
-          <div>
-            <h4>出库说明：</h4>
-            <span>{{myData.description}}</span>
+            <span>{{ myData.type }}</span>
           </div>
           <div>
             <h4>审核结果：</h4>
-            <span>{{myData.status}}</span>
-          </div>
-          <div>
-            <h4>审核说明：</h4>
-            <span>{{myData.reason}}</span>
+            <span>{{ myData.status }}</span>
           </div>
         </div>
+                  <div class="explain">
+            <p><span>出库说明：</span>{{ myData.description }}</p>
+          </div>
+          <div class="explain">
+            <p><span>审核说明：</span>{{ myData.reason }}</p>
+          </div>
+
         <!-- 表格 -->
         <div class="table">
           <div class="title">
-            <h3>藏品信息<el-button @click="goodsReturn" v-if="userAlso">归 还</el-button></h3>
+            <h3>
+              藏品信息<el-button @click="goodsReturn" v-if="userAlso"
+                >归 还</el-button
+              >
+            </h3>
           </div>
           <el-table
             @selection-change="handleSelectionChange"
@@ -50,15 +53,16 @@
             border
             style="width: 100%"
           >
-          <el-table-column
-             type="selection"
-             :selectable="selectable"
-             width="55">
-          </el-table-column>
-                <el-table-column label="缩略图" width="160">
-              <template #default='{row}'>
+            <el-table-column
+              type="selection"
+              :selectable="selectable"
+              width="55"
+            >
+            </el-table-column>
+            <el-table-column label="缩略图" width="160">
+              <template #default="{ row }">
                 <div class="smimg">
-                  <img :src="baseURL+row.thumb" alt="" />
+                  <img :src="baseURL + row.thumb" alt="" />
                 </div>
               </template>
             </el-table-column>
@@ -76,9 +80,9 @@
           </el-table>
         </div>
         <!-- 最下面的按钮 -->
-          <div class="button">
-              <el-button @click="$router.go(-1)">返回</el-button>
-          </div>
+        <div class="button">
+          <el-button @click="$router.go(-1)">返回</el-button>
+        </div>
       </div>
     </div>
   </div>
@@ -125,35 +129,40 @@ export default {
         { id: 1, name: '已入库' },
         { id: 2, name: '未归还' }
       ]
-      return list.filter(v => id === v.id)[0].name
+      return list.filter((v) => id === v.id)[0].name
     },
     // 点击归还
     goodsReturn () {
-      if (this.goodsIds.length === 0) return this.$message.warning('至少选中一个!')
+      if (this.goodsIds.length === 0) { return this.$message.warning('至少选中一个!') }
       this.$confirm('确定归还吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(async () => {
-        const obj = { id: Number(this.myData.id), goodsIds: this.goodsIds.join(',') }
-        const res = await goodsReturn(obj)
-        // console.log(99999, res)
-        if (res.code === 0) {
-          this.$message.success('操作成功')
-          this.getDetailById()
-        } else this.$message.error('错误')
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消'
-        })
       })
+        .then(async () => {
+          const obj = {
+            id: Number(this.myData.id),
+            goodsIds: this.goodsIds.join(',')
+          }
+          const res = await goodsReturn(obj)
+          // console.log(99999, res)
+          if (res.code === 0) {
+            this.$message.success('操作成功')
+            this.getDetailById()
+          } else this.$message.error('错误')
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          })
+        })
     },
     // 表格的多选
     handleSelectionChange (rows) {
       // console.log(333, rows)
       const temp = []
-      rows.forEach(v => {
+      rows.forEach((v) => {
         temp.push(v.id)
       })
       const temp2 = new Set(temp)
@@ -168,7 +177,7 @@ export default {
     async getDetailById () {
       const res = await getDetailById(this.myData.id)
       this.tableData = res.data.goods
-      this.tableData.forEach(v => {
+      this.tableData.forEach((v) => {
         v.integrity = this.spoil(v.integrity)
         v.goodsTypeId = this.category(v.goodsTypeId)
         v.status = this.myStatus(v.status)
@@ -189,7 +198,7 @@ export default {
     temp = JSON.parse(temp)
     if (temp) {
       const temp2 = temp.role[0]
-      if (temp2 === 'sys_look' || temp2 === 'sys_collect') this.userAlso = false // 其他部门人员--征集部主任
+      if (temp2 === 'sys_look' || temp2 === 'sys_collect') { this.userAlso = false } // 其他部门人员--征集部主任
     }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
@@ -204,8 +213,7 @@ export default {
 <style lang='less' scoped>
 //@import url(); 引入公共css类
 .holding0_result {
-
-    /deep/#mytitle>span{
+  /deep/#mytitle > span {
     font-weight: 800;
   }
 
@@ -243,10 +251,11 @@ export default {
         width: 50%;
       }
     }
+
     .explain {
       border: 1px solid #ccc;
       color: black;
-      padding: 30px 150px 30px 20px;
+      padding: 15px;
       display: flex;
       flex-wrap: wrap;
       span {
@@ -254,7 +263,7 @@ export default {
       }
     }
     .table {
-      max-height: 420px;
+      max-height: 360px;
       overflow: auto;
       .smimg {
         border: 3px solid #ccc;
@@ -271,11 +280,11 @@ export default {
         color: black;
         height: 50px;
         line-height: 50px;
-        &>h3{
+        & > h3 {
           display: flex;
           justify-content: space-between;
           align-items: center;
-          /deep/.el-button{
+          /deep/.el-button {
             height: 30px;
             margin-right: 20px;
             display: flex;

src/views/holding/holding3.vue

@@ -35,7 +35,6 @@
             </el-select>
             <span>搜索：</span>
                 <el-select v-model="mydata.searchType" placeholder="请选择" style="width:108px">
-                  <el-option label="全部" value=""></el-option>
                   <el-option label="藏品名称" value="name"></el-option>
                   <el-option label="藏品年代" value="age"></el-option>
                   <el-option label="藏品质地" value="texture"></el-option>
@@ -173,7 +172,7 @@ export default {
       baseURL: '',
       // 请求藏品总账参数
       mydata: {
-        searchType: '', // 搜索类型， name:名称， age:年代， texture：质地
+        searchType: 'name', // 搜索类型， name:名称， age:年代， texture：质地
         goodsTypeId: '', // 藏品类型id
         pageNum: 1, // 起始页码，默认1为第一页
         pageSize: 10, // 每页数量

src/views/holding/holding5.vue

@@ -263,7 +263,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1]
+      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +

src/views/holding/holding5_look.vue

@@ -22,16 +22,18 @@
             <span>{{myData.realName}}</span>
           </div>
           <div>
-            <h4>注销说明：</h4>
-            <span>{{myData.description}}</span>
-          </div>
-          <div>
             <h4>审核结果：</h4>
             <span>{{myData.status}}</span>
           </div>
         </div>
         <div class="explain">
           <p>
+            <span>注销说明：</span
+            >{{myData.description}}
+          </p>
+        </div>
+        <div class="explain">
+          <p>
             <span>审核说明：</span
             >{{myData.reason}}
           </p>
@@ -198,13 +200,13 @@ export default {
         display: flex;
         align-items: center;
         border: 1px solid #ccc;
-        width: 50%;
+        width: 33.33%;
       }
     }
     .explain {
       border: 1px solid #ccc;
       color: black;
-      padding: 30px 150px 30px 20px;
+      padding: 15px;
       display: flex;
       flex-wrap: wrap;
       span {
@@ -212,7 +214,7 @@ export default {
       }
     }
     .table {
-      max-height: 420px;
+      max-height: 380px;
       overflow: auto;
       .smimg {
         border: 3px solid #ccc;

src/views/system/system2_Edit.vue

@@ -6,7 +6,7 @@
           <el-input v-model="form.realName" placeholder="请输入" style="width:300px"></el-input>
         </el-form-item>
         <el-form-item label="账号：" prop="userName">
-          <el-input v-model="form.userName" placeholder="请输入" style="width:300px"></el-input>
+          <el-input disabled v-model="form.userName" placeholder="请输入" style="width:300px"></el-input>
         </el-form-item>
         <!-- <el-form-item label="密码：" prop="passWord">
           <el-input v-model="form.passWord" placeholder="请输入" style="width:300px" show-password></el-input>

src/views/system/system2_add.vue

@@ -137,6 +137,8 @@ export default {
             phone: '',
             isEnabled: 1
           }
+        } else if (res.code === -1) {
+          this.$message.error('该账号名已被使用，请重新修改账号名！')
         }
       } catch (error) {
         console.log(error)