修复bug

src/assets/style/initial.css

@@ -79,3 +79,9 @@ a {
 .el-textarea__inner:focus{
   border-color: #3E5EB3;
 }
+.el-cascader .el-input .el-input__inner:focus, .el-cascader .el-input.is-focus .el-input__inner{
+  border-color: #3E5EB3;
+}
+.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path{
+  color: #3E5EB3;
+}

src/utils/request.js

@@ -2,8 +2,8 @@ import axios from 'axios'
 // export const baseURL = '666初始地址'
 const service = axios.create({
   // baseURL: 'http://192.168.0.135:8006', // 本地调试
-  // baseURL: 'http://8.135.106.227:8006', // 线上调试
-  baseURL: '', // build
+  baseURL: 'http://8.135.106.227:8006', // 线上调试
+  // baseURL: '', // build
   timeout: 5000
 })
 

src/views/holding/holding0.vue

@@ -90,9 +90,9 @@
                   <el-button
                     v-show="userLimits.edit"
                     type="text"
-                    v-if="row.status === '待办理' || row.status === '待办理'"
+                    v-if="row.status === '待办理' || row.status === '馆长不通过'|| row.status === '主任不通过'"
                     @click="editH0(row)"
-                    >编辑</el-button
+                    >{{row.status === '待办理'?'编辑':'重新提交'}}</el-button
                   >
                   <el-button
                     v-show="userLimits.audit"

src/views/holding/holding1.vue

@@ -120,10 +120,10 @@
                   >
                   <el-button
                     type="text"
-                    v-if="row.status === '待办理'"
+                    v-if="row.status === '待办理'||row.status === '主任不通过'||row.status === '馆长不通过'"
                     @click="compile(row)"
                     v-show="userLimits.edit"
-                    >编辑</el-button
+                    >{{row.status === '待办理'?'编辑':'重新提交'}}</el-button
                   >
                   <el-button
                     type="text"

src/views/holding/holding2.vue

@@ -131,10 +131,10 @@
                   >
                   <el-button
                     type="text"
-                    v-if="row.status === '待办理'"
+                    v-if="row.status === '待办理'||row.status === '主任不通过'||row.status === '馆长不通过'"
                     @click="compile(row)"
                     v-show="userLimits.edit"
-                    >编辑</el-button
+                    >{{row.status === '待办理'?'编辑':'重新提交'}}</el-button
                   >
                   <el-button
                     type="text"

src/views/holding/holding3.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div class="holding3">
-    <TabList :ind='3'/>
+    <TabList :ind="3" />
     <div class="right">
       <div class="top">
         <el-breadcrumb separator="/">
@@ -14,7 +14,11 @@
         <div class="middle">
           <div class="select">
             <span>藏品类型：</span>
-            <el-select v-model="mydata.goodsTypeId" placeholder="请选择">
+            <el-select
+              v-model="mydata.goodsTypeId"
+              placeholder="请选择"
+              style="width: 160px"
+            >
               <el-option
                 v-for="item in mytype"
                 :key="item.id"
@@ -25,7 +29,11 @@
             </el-select>
 
             <span>藏品来源：</span>
-            <el-select v-model="mydata.sourceId" placeholder="请选择">
+            <el-select
+              v-model="mydata.sourceId"
+              placeholder="请选择"
+              style="width: 160px"
+            >
               <el-option
                 v-for="item in sourceList"
                 :key="item.id"
@@ -36,33 +44,54 @@
             </el-select>
 
             <span>搜索：</span>
-                <el-select v-model="mydata.searchType" placeholder="请选择" style="width:108px" class="myInput">
-                  <el-option label="藏品名称" value="name"></el-option>
-                  <el-option label="藏品年代" value="age"></el-option>
-                  <el-option label="藏品质地" value="texture"></el-option>
-                </el-select>
+            <el-select
+              v-model="mydata.searchType"
+              placeholder="请选择"
+              style="width: 108px"
+              class="myInput"
+            >
+              <el-option label="藏品名称" value="name"></el-option>
+              <el-option label="藏品年代" value="age"></el-option>
+              <el-option label="藏品质地" value="texture"></el-option>
+            </el-select>
             <el-input
               class="myInput2"
               v-model="mydata.searchKey"
               placeholder="请输入"
-              style="width: 217px"
+              style="width: 160px"
             ></el-input>
-            <el-button style="margin: 0 20px 0" @click="inquire" type="primary">查 询</el-button>
-<!-- 导出 -->
-<download-excel
-      :before-generate="derive"
-      class = "export-excel-wrapper"
-      :data = "json_data"
-      :fields = "json_fields"
-      name = "藏品信息.xls">
-      <!-- 上面可以自定义自己的样式，还可以引用其他组件button -->
-      <el-button>导 出</el-button>
-</download-excel>
+            <span>位置：</span>
+            <el-cascader
+              clearable
+              ref="cascaderAddr"
+              placeholder="请选择"
+              :props="{ value: 'id', label: 'name' }"
+              v-model="optionsArr"
+              :options="options"
+            ></el-cascader>
+            <el-button style="margin: 0 20px 0" @click="inquire" type="primary"
+              >查 询</el-button
+            >
+            <!-- 导出 -->
+            <download-excel
+              :before-generate="derive"
+              class="export-excel-wrapper"
+              :data="json_data"
+              :fields="json_fields"
+              name="藏品信息.xls"
+            >
+              <!-- 上面可以自定义自己的样式，还可以引用其他组件button -->
+              <el-button>导 出</el-button>
+            </download-excel>
             <div class="pattern">
               <div :class="{ active: change === 0 }" @click="pattern(0)">
                 <i class="el-icon-menu"></i>
               </div>
-              <div :class="{ active: change === 1 }" @click="pattern(1)" style="border-radius:0 12px 12px 0;">
+              <div
+                :class="{ active: change === 1 }"
+                @click="pattern(1)"
+                style="border-radius: 0 12px 12px 0"
+              >
                 <i class="el-icon-s-unfold"></i>
               </div>
             </div>
@@ -76,30 +105,56 @@
               style="width: 100%"
             >
               <el-table-column label="缩略图" width="80" :resizable="false">
-                <template #default='{row}'>
+                <template #default="{ row }">
                   <div class="smimg">
-                    <img :src="baseURL+row.thumb" alt="" :onerror='defaultImg'/>
+                    <img
+                      :src="baseURL + row.thumb"
+                      alt=""
+                      :onerror="defaultImg"
+                    />
                   </div>
                 </template>
               </el-table-column>
               <el-table-column
-              :resizable="false"
+                :resizable="false"
                 prop="registerNum"
                 sortable
                 label="总登记号"
                 width="235"
               >
               </el-table-column>
-              <el-table-column prop="name" sortable label="藏品名称" :resizable="false">
+              <el-table-column
+                prop="name"
+                sortable
+                label="藏品名称"
+                :resizable="false"
+              >
               </el-table-column>
-              <el-table-column prop="age" sortable label="年代" width="180" :resizable="false">
+              <el-table-column
+                prop="age"
+                sortable
+                label="年代"
+                width="180"
+                :resizable="false"
+              >
               </el-table-column>
-              <el-table-column prop="texture" sortable label="质地" width="220" :resizable="false">
+              <el-table-column
+                prop="texture"
+                sortable
+                label="质地"
+                width="220"
+                :resizable="false"
+              >
               </el-table-column>
-              <el-table-column prop="status" label="状态" width="130" :resizable="false">
+              <el-table-column
+                prop="status"
+                label="状态"
+                width="130"
+                :resizable="false"
+              >
               </el-table-column>
               <el-table-column label="操作" width="130" :resizable="false">
-                <template #default="{row}">
+                <template #default="{ row }">
                   <el-button type="text" @click="myLook(row)">查看</el-button>
                 </template>
               </el-table-column>
@@ -123,18 +178,24 @@
           </div>
           <!-- 图片显示 -->
           <div class="imgInfo" v-else>
-            <div class="beNull" v-if="imgList.length===0">暂无数据</div>
-            <div v-else class="imgInfo_single" v-for="(item,index) in imgList" :key="index" @click="myLook(item)">
-              <img :src="baseURL+item.thumb" alt=""  :onerror='defaultImg'/>
-              <span>{{item.name}}</span>
+            <div class="beNull" v-if="imgList.length === 0">暂无数据</div>
+            <div
+              v-else
+              class="imgInfo_single"
+              v-for="(item, index) in imgList"
+              :key="index"
+              @click="myLook(item)"
+            >
+              <img :src="baseURL + item.thumb" alt="" :onerror="defaultImg" />
+              <span>{{ item.name }}</span>
             </div>
           </div>
           <!-- 分页器 -->
           <div class="paging">
             <el-pagination
-              :current-page='mydata.pageNum'
-              @current-change='currentChange'
-              @size-change='sizeChange'
+              :current-page="mydata.pageNum"
+              @current-change="currentChange"
+              @size-change="sizeChange"
               background
               layout="prev, pager, next,sizes,jumper"
               :total="total"
@@ -160,6 +221,8 @@ export default {
       // 藏品来源多选数据
       sourceList: [],
       options: [],
+      optionsArr: [],
+
       // 入库位置数据
       // 导出表格的数据
       json_fields: {
@@ -229,26 +292,29 @@ export default {
   watch: {},
   // 方法集合
   methods: {
-
     // 点击导出
     async derive () {
-      const res = await getHolding3List({ ...this.mydata, pageNum: 1, pageSize: 99999 })
+      const res = await getHolding3List({
+        ...this.mydata,
+        pageNum: 1,
+        pageSize: 99999
+      })
       this.json_data = res.data.list
-      this.json_data.forEach(v => {
-      // 位置信息处理
-        this.options.forEach(p => {
-        // eslint-disable-next-line
-          if(p.id== v.storageId.split(',')[0]) {
+      this.json_data.forEach((v) => {
+        // 位置信息处理
+        this.options.forEach((p) => {
+          // eslint-disable-next-line
+          if (p.id == v.storageId.split(",")[0]) {
             if (p.children) {
               v.myweizhi = p.name
-              p.children.forEach(p2 => {
-              // eslint-disable-next-line
-                  if(p2.id==v.storageId.split(',')[1]) {
+              p.children.forEach((p2) => {
+                // eslint-disable-next-line
+                if (p2.id == v.storageId.split(",")[1]) {
                   if (p2.children) {
                     v.myweizhi += '/' + p2.name
-                    p2.children.forEach(p3 => {
-                    // eslint-disable-next-line
-                            if (p3.id == v.storageId.split(',')[2]) {
+                    p2.children.forEach((p3) => {
+                      // eslint-disable-next-line
+                      if (p3.id == v.storageId.split(",")[2]) {
                         v.myweizhi += '/' + p3.name
                       }
                     })
@@ -299,8 +365,8 @@ export default {
       // console.log(666, res)
       this.imgList = res.data.list
       this.tableData = res.data.list
-      this.tableData.forEach(v => {
-      // 位置信息处理
+      this.tableData.forEach((v) => {
+        // 位置信息处理
         // this.options.forEach(p => {
         // // eslint-disable-next-line
         //   if(p.id== v.storageId.split(',')[0]) {
@@ -377,24 +443,25 @@ export default {
 </script>
 <style lang='less' scoped>
 .holding3 {
-  .myInput2{
-    /deep/.el-input__inner{
-      border-radius:  0 3px 3px 0!important;
+  .myInput2 {
+    /deep/.el-input__inner {
+      border-radius: 0 3px 3px 0 !important;
     }
   }
-  .myInput{
-    /deep/.el-input__inner{
+  .myInput {
+    /deep/.el-input__inner {
       border-radius: 3px 0 0 3px !important;
     }
   }
-    /deep/#mytitle>span{
+  /deep/#mytitle > span {
     font-weight: 800;
   }
 
   display: flex;
   .right {
     width: 100%;
-   .top {
+    min-width: 1565px;
+    .top {
       padding-left: 18px;
       display: flex;
       align-items: center;
@@ -419,7 +486,7 @@ export default {
             width: 130px;
             height: 40px;
             .active {
-              background-color: #3E5EB3;
+              background-color: #3e5eb3;
               color: #fff;
             }
             div {
@@ -440,11 +507,11 @@ export default {
           color: black;
           padding: 30px 0 0 0;
           & > span {
-            margin-left: 30px;
+            margin-left: 15px;
           }
         }
         .table {
-          /deep/.el-table__body-wrapper{
+          /deep/.el-table__body-wrapper {
             max-height: 560px;
             max-width: 1634px;
             overflow-y: auto;
@@ -468,7 +535,7 @@ export default {
           width: 98%;
           border-top: 1px solid #ccc;
           margin: 35px auto 0;
-          .beNull{
+          .beNull {
             margin-top: 40px;
             font-size: 26px;
           }

src/views/holding/holding3_look.vue

@@ -184,15 +184,20 @@
             </div>
           </div>
           <div class="row">
-            <div><span>入库位置</span>
-            <p v-if="myObj.status !== '待入库'">{{ rukuTxt ? rukuTxt : "-" }}</p>
-            <p v-else>-</p>
+            <div>
+              <span>入库位置</span>
+              <p v-if="myObj.status !== '待入库'">
+                {{ rukuTxt ? rukuTxt : "-" }}
+              </p>
+              <p v-else>-</p>
             </div>
           </div>
           <div class="row">
             <div>
               <span>出库位置</span>
-              <p v-if="myObj.status === '已出库'">{{ myObj.outPath ? myObj.outPath : "-" }}</p>
+              <p v-if="myObj.status === '已出库'">
+                {{ myObj.outPath ? myObj.outPath : "-" }}
+              </p>
               <p v-else>-</p>
             </div>
           </div>
@@ -212,16 +217,15 @@
       <div class="conten">
         <!-- 顶部 -->
         <div class="conten_top">
-            <h3>{{ myObj.name }}</h3>
-            <div v-if="myObj.status === '已入库'">已入库</div>
-            <div
-              v-else-if="myObj.status === '待入库'"
-              style="background-color: #ccc"
-            >
-              待入库
-            </div>
-            <div v-else style="background-color: #85ce61">已出库</div>
-
+          <h3>{{ myObj.name }}</h3>
+          <div v-if="myObj.status === '已入库'">已入库</div>
+          <div
+            v-else-if="myObj.status === '待入库'"
+            style="background-color: #ccc"
+          >
+            待入库
+          </div>
+          <div v-else style="background-color: #85ce61">已出库</div>
         </div>
         <div class="daochu">
           <el-button
@@ -235,202 +239,213 @@
             type="primary"
             size="small"
             @click="applyMove"
-            v-if="myObj.storageId && myObj.status !== '已出库' && myObj.status !== '待入库'"
+            v-if="
+              myObj.storageId &&
+              myObj.status !== '已出库' &&
+              myObj.status !== '待入库'
+            "
             v-show="userLimits.move"
             >申请移库</el-button
           >
           <el-button size="small" @click="record">操作记录</el-button>
           <el-button size="small" @click="exPdf">导 出</el-button>
         </div>
-
-        <div class="conten_left">
-          <img :src="baseURL + myObj.thumb" alt="" :onerror="defaultImg" />
-        </div>
-        <div class="conten_right">
-          <div class="info">
-            <div class="row">
-              <div>
-                <span>藏品名称</span>
-                <p :title="myObj.name">{{ myObj.name ? myObj.name : "-" }}</p>
-              </div>
-              <div>
-                <span>原 名</span>
-                <p :title="myObj.primitiveName">
-                  {{ myObj.primitiveName ? myObj.primitiveName : "-" }}
-                </p>
-              </div>
-              <div>
-                <span>年 代</span>
-                <p :title="myObj.age">{{ myObj.age ? myObj.age : "-" }}</p>
-              </div>
-            </div>
-            <div class="row">
-              <div>
-                <span>总登记号</span>
-                <p :title="myObj.registerNum">
-                  {{ myObj.registerNum ? myObj.registerNum : "-" }}
-                </p>
-              </div>
-              <div>
-                <span>编号类型</span>
-                <p :title="myObj.numTypeId">
-                  {{ myObj.numTypeId ? myObj.numTypeId : "-" }}
-                </p>
-              </div>
-              <div>
-                <span>藏品编号</span>
-                <p :title="myObj.num">{{ myObj.num ? myObj.num : "-" }}</p>
-              </div>
-            </div>
-            <div class="row">
-              <div>
-                <span>文物类别</span>
-                <p :title="myObj.goodsTypeName">
-                  {{ myObj.goodsTypeName ? myObj.goodsTypeName : "-" }}
-                </p>
-              </div>
-              <div>
-                <span>文物级别</span>
-                <p :title="myObj.level">
-                  {{ myObj.level ? myObj.level : "-" }}
-                </p>
-              </div>
-              <div>
-                <span>文物来源</span>
-                <p :title="myObj.sourceName">
-                  {{ myObj.sourceName ? myObj.sourceName : "-" }}
-                </p>
-              </div>
-            </div>
-            <div class="row">
-              <div>
-                <span>质地类型</span>
-                <p :title="myObj.textureType">
-                  {{ myObj.textureType ? myObj.textureType : "-" }}
-                </p>
-              </div>
-              <div>
-                <span>质地类别</span>
-                <p :title="myObj.textureCategory">
-                  {{ myObj.textureCategory ? myObj.textureCategory : "-" }}
-                </p>
-              </div>
-              <div>
-                <span>质 地</span>
-                <p :title="myObj.texture">
-                  {{ myObj.texture ? myObj.texture : "-" }}
-                </p>
-              </div>
-            </div>
-            <div class="row">
-              <div>
-                <span>通 长</span>
-                <p :title="myObj.length">
-                  {{ myObj.length ? myObj.length : "-" }}
-                </p>
-              </div>
-              <div>
-                <span>通 宽</span>
-                <p :title="myObj.width">
-                  {{ myObj.width ? myObj.width : "-" }}
-                </p>
-              </div>
-              <div>
-                <span>通 高</span>
-                <p :title="myObj.height">
-                  {{ myObj.height ? myObj.height : "-" }}
-                </p>
+        <div class="contenBox">
+          <div class="conten_left">
+            <img :src="baseURL + myObj.thumb" alt="" :onerror="defaultImg" />
+          </div>
+          <div class="conten_right">
+            <div class="info">
+              <div class="row">
+                <div>
+                  <span>藏品名称</span>
+                  <p :title="myObj.name">{{ myObj.name ? myObj.name : "-" }}</p>
+                </div>
+                <div>
+                  <span>原 名</span>
+                  <p :title="myObj.primitiveName">
+                    {{ myObj.primitiveName ? myObj.primitiveName : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>年 代</span>
+                  <p :title="myObj.age">{{ myObj.age ? myObj.age : "-" }}</p>
+                </div>
               </div>
-            </div>
-            <div class="row">
-              <div>
-                <span>数量类型</span>
-                <p :title="myObj.amountType">
-                  {{ myObj.amountType ? myObj.amountType : "-" }}
-                </p>
+              <div class="row">
+                <div>
+                  <span>总登记号</span>
+                  <p :title="myObj.registerNum">
+                    {{ myObj.registerNum ? myObj.registerNum : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>编号类型</span>
+                  <p :title="myObj.numTypeId">
+                    {{ myObj.numTypeId ? myObj.numTypeId : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>藏品编号</span>
+                  <p :title="myObj.num">{{ myObj.num ? myObj.num : "-" }}</p>
+                </div>
               </div>
-              <div>
-                <span>具体数量</span>
-                <p :title="myObj.amount">
-                  {{ myObj.amount ? myObj.amount : "-" }}
-                </p>
+              <div class="row">
+                <div>
+                  <span>文物类别</span>
+                  <p :title="myObj.goodsTypeName">
+                    {{ myObj.goodsTypeName ? myObj.goodsTypeName : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>文物级别</span>
+                  <p :title="myObj.level">
+                    {{ myObj.level ? myObj.level : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>文物来源</span>
+                  <p :title="myObj.sourceName">
+                    {{ myObj.sourceName ? myObj.sourceName : "-" }}
+                  </p>
+                </div>
               </div>
-              <div>
-                <span>质量范围</span>
-                <p :title="myObj.qualityScope">
-                  {{ myObj.qualityScope ? myObj.qualityScope : "-" }}
-                </p>
+              <div class="row">
+                <div>
+                  <span>质地类型</span>
+                  <p :title="myObj.textureType">
+                    {{ myObj.textureType ? myObj.textureType : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>质地类别</span>
+                  <p :title="myObj.textureCategory">
+                    {{ myObj.textureCategory ? myObj.textureCategory : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>质 地</span>
+                  <p :title="myObj.texture">
+                    {{ myObj.texture ? myObj.texture : "-" }}
+                  </p>
+                </div>
               </div>
-            </div>
-            <div class="row">
-              <div>
-                <span>具体质量</span>
-                <p :title="myObj.quality">
-                  {{ myObj.quality ? myObj.quality : "-" }}
-                </p>
+              <div class="row">
+                <div>
+                  <span>通 长</span>
+                  <p :title="myObj.length">
+                    {{ myObj.length ? myObj.length : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>通 宽</span>
+                  <p :title="myObj.width">
+                    {{ myObj.width ? myObj.width : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>通 高</span>
+                  <p :title="myObj.height">
+                    {{ myObj.height ? myObj.height : "-" }}
+                  </p>
+                </div>
               </div>
-              <div>
-                <span>入藏时间范围</span>
-                <p :title="myObj.checkInScope">
-                  {{ myObj.checkInScope ? myObj.checkInScope : "-" }}
-                </p>
+              <div class="row">
+                <div>
+                  <span>数量类型</span>
+                  <p :title="myObj.amountType">
+                    {{ myObj.amountType ? myObj.amountType : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>具体数量</span>
+                  <p :title="myObj.amount">
+                    {{ myObj.amount ? myObj.amount : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>质量范围</span>
+                  <p :title="myObj.qualityScope">
+                    {{ myObj.qualityScope ? myObj.qualityScope : "-" }}
+                  </p>
+                </div>
               </div>
-              <div>
-                <span>入藏年度</span>
-                <p :title="myObj.checkInYear">
-                  {{ myObj.checkInYear ? myObj.checkInYear : "-" }}
-                </p>
+              <div class="row">
+                <div>
+                  <span>具体质量</span>
+                  <p :title="myObj.quality">
+                    {{ myObj.quality ? myObj.quality : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>入藏时间范围</span>
+                  <p :title="myObj.checkInScope">
+                    {{ myObj.checkInScope ? myObj.checkInScope : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>入藏年度</span>
+                  <p :title="myObj.checkInYear">
+                    {{ myObj.checkInYear ? myObj.checkInYear : "-" }}
+                  </p>
+                </div>
               </div>
-            </div>
-            <div class="row">
-              <div>
-                <span>完残程度</span>
-                <p :title="myObj.integrity">
-                  {{ myObj.integrity ? myObj.integrity : "-" }}
-                </p>
+              <div class="row">
+                <div>
+                  <span>完残程度</span>
+                  <p :title="myObj.integrity">
+                    {{ myObj.integrity ? myObj.integrity : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>保存状态</span>
+                  <p :title="myObj.repair">
+                    {{ myObj.repair ? myObj.repair : "-" }}
+                  </p>
+                </div>
+                <div>
+                  <span>完残状况</span>
+                  <p :title="myObj.repairRemark">
+                    {{ myObj.repairRemark ? myObj.repairRemark : "-" }}
+                  </p>
+                </div>
               </div>
-              <div>
-                <span>保存状态</span>
-                <p :title="myObj.repair">
-                  {{ myObj.repair ? myObj.repair : "-" }}
-                </p>
+              <div class="row">
+                <div>
+                  <span>来源说明</span>
+                  <p style="flex: 1" :title="myObj.description">
+                    {{ myObj.description ? myObj.description : "-" }}
+                  </p>
+                </div>
               </div>
-              <div>
-                <span>完残状况</span>
-                <p :title="myObj.repairRemark">
-                  {{ myObj.repairRemark ? myObj.repairRemark : "-" }}
-                </p>
+              <div class="row">
+                <div style="height: 36px">
+                  <span>入库位置</span>
+                  <el-cascader
+                    ref="cascaderAddr"
+                    v-if="
+                      myObj.location &&
+                      myObj.location.length >= 1 &&
+                      myObj.status !== '待入库'
+                    "
+                    placeholder=""
+                    disabled
+                    style="width: 80%"
+                    :props="{ value: 'id', label: 'name' }"
+                    v-model="myObj.location"
+                    :options="options"
+                  ></el-cascader>
+                  <i v-else>-</i>
+                </div>
               </div>
-            </div>
-            <div class="row">
-              <div>
-                <span>来源说明</span>
-                <p style="flex: 1" :title="myObj.description">
-                  {{ myObj.description ? myObj.description : "-" }}
-                </p>
-              </div>
-            </div>
-            <div class="row">
-              <div style="height: 36px">
-                <span>入库位置</span>
-                <el-cascader
-                  ref="cascaderAddr"
-                  v-if="myObj.location && myObj.location.length >= 1 && myObj.status !== '待入库'"
-                  placeholder=""
-                  disabled
-                  style="width: 80%"
-                  :props="{ value: 'id', label: 'name' }"
-                  v-model="myObj.location"
-                  :options="options"
-                ></el-cascader>
-                <i v-else>-</i>
-              </div>
-            </div>
-            <div class="row">
-              <div>
-                <span>出库位置</span>
-                <p :title="myObj.outPath" v-if="myObj.status === '已出库'">{{ myObj.outPath ? myObj.outPath : "-" }}</p>
-                <p v-else>-</p>
+              <div class="row">
+                <div>
+                  <span>出库位置</span>
+                  <p :title="myObj.outPath" v-if="myObj.status === '已出库'">
+                    {{ myObj.outPath ? myObj.outPath : "-" }}
+                  </p>
+                  <p v-else>-</p>
+                </div>
               </div>
             </div>
           </div>
@@ -637,7 +652,7 @@ export default {
       myObj: [],
       // 表格数据
       tableData: [],
-      resource: 'video',
+      resource: 'img',
       affix: [
         { label: '高清图片', value: 'img' },
         { label: '视频文件', value: 'video' },
@@ -905,7 +920,7 @@ body .el-table::before {
     color: #3e5eb3;
     margin: 4px;
   }
-    .title {
+  .title {
     display: flex;
     border-bottom: 2px solid #ccc;
     height: 40px;
@@ -930,13 +945,13 @@ body .el-table::before {
   }
 
   .info {
-    border:1px solid #ccc;
+    border: 1px solid #ccc;
     border-right: none;
     border-bottom: none;
-    margin: 0px 0 0 55px;
+    // margin: 0px 0 0 55px;
     // max-height: 370px;
     // overflow-y: auto;
-    width: 90%;
+    // width: 90%;
     // margin-bottom: 60px;
     .row {
       border-bottom: 1px solid #ccc;
@@ -1025,29 +1040,37 @@ body .el-table::before {
     }
   }
   .conten {
-    .conten_top{
-    width: 100%;
-    display: flex;
-    border-bottom: 2px solid #ccc;
-    height: 50px;
-    align-items: center;
-    margin-right: 62px;
-    h3 {
-      font-size: 20px;
-      color: black;
-      margin: 0 25px 0 0px;
+    min-width: 1300px;
+    .contenBox{
+      padding-right: 65px;
+      justify-content: space-between;
+      display: flex;
+      width: 100%;
     }
-    & > div {
-      padding: 0 5px;
+    .conten_top {
+      width: 100%;
       display: flex;
-      justify-content: center;
+      border-bottom: 2px solid #ccc;
+      height: 50px;
       align-items: center;
-      height: 20px;
-      background-color: #3e5eb3;
-      color: #fff;
-      font-size: 13px;
-      border-radius: 5px;
-    }    }
+      margin-right: 62px;
+      h3 {
+        font-size: 20px;
+        color: black;
+        margin: 0 25px 0 0px;
+      }
+      & > div {
+        padding: 0 5px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 20px;
+        background-color: #3e5eb3;
+        color: #fff;
+        font-size: 13px;
+        border-radius: 5px;
+      }
+    }
     position: relative;
     .daochu {
       position: absolute;
@@ -1061,8 +1084,11 @@ body .el-table::before {
     margin: 0 20px 40px;
     padding: 10px 0 0 40px;
     .conten_left {
+      margin-right: 10px;
       margin-top: -34px;
-      width: 465px;
+      max-width: 450px;
+      min-width: 200px;
+      flex: 1;
       height: 409px;
       background-color: #f1f2f6;
       display: flex;
@@ -1075,10 +1101,11 @@ body .el-table::before {
       }
     }
     .conten_right {
-      flex: 1;
+      min-width: 920px;
       max-height: 410px;
       overflow-y: auto;
       margin-top: -34px;
+      overflow-x: hidden;
     }
     .conten_bot {
       margin-top: -40px;
@@ -1122,21 +1149,21 @@ body .el-table::before {
       }
     }
   }
-  #myPdfCon{
-    .info{
-      border:none;
-      .row{
-        border:none;
+  #myPdfCon {
+    .info {
+      border: none;
+      .row {
+        border: none;
         height: 0;
         display: inline;
-        &>div {
-          border:1px solid #ccc;
-          border-top:none;
+        & > div {
+          border: 1px solid #ccc;
+          border-top: none;
           min-height: 37px;
           position: relative;
           flex-wrap: wrap;
           height: auto;
-          &>span{
+          & > span {
             display: flex;
             align-items: center;
             justify-content: center;
@@ -1146,7 +1173,7 @@ body .el-table::before {
             top: 0;
             height: 100%;
           }
-          &>p {
+          & > p {
             text-align: left;
             padding-left: 122px;
             flex: 1;
@@ -1155,7 +1182,7 @@ body .el-table::before {
             word-wrap: break-word;
             word-break: break-all;
             overflow: visible;
-            white-space:normal
+            white-space: normal;
           }
         }
       }

src/views/holding/holding5.vue

@@ -113,10 +113,10 @@
                   >
                   <el-button
                     type="text"
-                    v-if="row.status === '待办理'"
+                    v-if="row.status === '待办理'||row.status === '主任不通过'||row.status === '馆长不通过'"
                     @click="compile(row)"
                     v-show="userLimits.edit"
-                    >编辑</el-button
+                    >{{row.status === '待办理'?'编辑':'重新提交'}}</el-button
                   >
                   <el-button
                     type="text"

src/views/statistics/statistics2_look.vue

@@ -141,6 +141,8 @@ export default {
       obj.integrity = this.spoil(obj.integrity)// 完残程度
       obj.repair = this.mySave(obj.repair)// 保存状态
       this.myObjLook = obj
+      // 调用子组件的方法，获取附件信息
+      this.$refs.mylook.getFileList(obj.id, 'video')
       this.isShow = true
     }
   },