更改需求

src/views/holding/holding0_DiaEdit.vue

@@ -216,6 +216,10 @@
           ></el-input>
         </el-form-item>
       </div>
+        <!-- 11-5新增 -->
+        <el-form-item label="来源说明：">
+          <el-input type="textarea" :rows="3" v-model="ruleForm.description" placeholder="请输入"></el-input>
+        </el-form-item>
       <!-- 图片和附件 -->
       <el-form-item label="藏品图片：">
         <el-upload
@@ -366,7 +370,8 @@ export default {
         textureCategory: '', // 质地类别
         textureType: '', // 质地类型，前端输入, 0:单一质地， 1：复活质地
         thumb: '', // 缩略图url
-        width: '' // 宽
+        width: '', // 宽
+        description: ''// 来源说明
       },
       checkInScope: [
         '请选择',

src/views/holding/holding0_Dialog.vue

@@ -218,6 +218,10 @@
           ></el-input>
         </el-form-item>
       </div>
+        <!-- 11-5新增 -->
+        <el-form-item label="来源说明：">
+          <el-input type="textarea" :rows="3" v-model="ruleForm.description" placeholder="请输入"></el-input>
+        </el-form-item>
       <!-- 图片和附件 -->
       <el-form-item label="藏品图片：">
         <el-upload
@@ -370,7 +374,8 @@ export default {
         textureCategory: '', // 质地类别
         textureType: '', // 质地类型，前端输入, 0:单一质地， 1：复活质地
         thumb: '', // 缩略图url
-        width: '' // 宽
+        width: '', // 宽
+        description: ''// 来源说明
       },
       checkInScope: [
         '请选择',
@@ -576,8 +581,8 @@ export default {
           textureCategory: '', // 质地类别
           textureType: '', // 质地类型，前端输入, 0:单一质地， 1：复活质地
           thumb: '', // 缩略图url
-          width: '' // 宽
-
+          width: '', // 宽
+          description: ''// 来源说明
         }
         this.$message.success('新增成功')
         // 通知父组件更新界面

src/views/holding/holding0_audit.vue

@@ -66,7 +66,7 @@
                 <el-button type="text" @click="myLook(row)">查 看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="藏品归属" width="200" :resizable="false">
+            <el-table-column label="藏品归属" width="200" :resizable="false" v-if="0">
               <template #default='scopt' >
 <el-switch
  @click.native="myswitch1(scopt.$index,scopt.row.id)"
@@ -213,7 +213,7 @@ export default {
         v.repair = this.mySave(v.repair)
         this.switch1.push(false)
         // 首先把所有的入库变成0（不入库状态）
-        this.mySrt[v.id] = 0
+        this.mySrt[v.id] = 1
         if (v.amountType === 0) v.amountType = '单件'
         else if (v.amountType === 1) v.amountType = '一套多件'
       })

src/views/holding/holding0_audit_Dia.vue

@@ -55,6 +55,9 @@
               <div><span>具体质量：</span>{{ myObj.quality?myObj.quality:'-' }}</div>
             </div>
             <div class="row">
+              <div><span>藏品来源：</span>{{ myObj.description?myObj.description:'-' }}</div>
+            </div>
+            <div class="row">
               <div><span>入藏时间范围：</span>{{ myObj.checkInScope?myObj.checkInScope:'-' }}</div>
               <div><span>入藏年度：</span>{{ myObj.checkInYear?myObj.checkInYear:'-' }}</div>
             </div>

src/views/holding/holding3.vue

@@ -182,6 +182,7 @@ export default {
         具体质量: 'quality',
         入藏时间范围: 'checkInScope',
         入藏年度: 'checkInYear',
+        来源说明: 'description',
         入库位置: 'myweizhi',
         出库位置: 'outPath'
       },

src/views/holding/holding3_DiaEdit.vue

@@ -216,6 +216,10 @@
           ></el-input>
         </el-form-item>
       </div>
+        <!-- 11-5新增 -->
+        <el-form-item label="来源说明：">
+          <el-input type="textarea" :rows="3" v-model="ruleForm.description" placeholder="请输入"></el-input>
+        </el-form-item>
       <!-- 图片和附件 -->
       <el-form-item label="藏品图片：">
         <el-upload
@@ -366,7 +370,8 @@ export default {
         textureCategory: '', // 质地类别
         textureType: '', // 质地类型，前端输入, 0:单一质地， 1：复活质地
         thumb: '', // 缩略图url
-        width: '' // 宽
+        width: '', // 宽
+        description: ''// 来源说明
       },
       checkInScope: [
         '请选择',

src/views/holding/holding3_look.vue

@@ -24,7 +24,7 @@
           </div>
           <div v-else style="background-color: #85ce61">已出库</div>
         </div>
-        <div class="info">
+        <div class="info" style="max-height:100vh">
           <div class="row">
             <div>
               <span>藏品名称：</span>{{ myObj.name ? myObj.name : "-" }}
@@ -56,9 +56,10 @@
             <div>
               <span>文物级别：</span>{{ myObj.level ? myObj.level : "-" }}
             </div>
-              <div>
-                <span>文物来源：</span>{{ myObj.sourceName ? myObj.sourceName : "-" }}
-              </div>
+            <div>
+              <span>文物来源：</span
+              >{{ myObj.sourceName ? myObj.sourceName : "-" }}
+            </div>
           </div>
           <div class="row">
             <div>
@@ -125,7 +126,14 @@
               >{{ myObj.checkInYear ? myObj.checkInYear : "-" }}
             </div>
           </div>
-
+          <div class="row">
+            <div>
+              <span style="width: 80px">来源说明：</span>
+              <p style="flex: 1;text-align: left;">
+                {{ myObj.description ? myObj.description : "-" }}
+              </p>
+            </div>
+          </div>
           <div class="row">
             <div><span>入库位置：</span>{{ rukuTxt ? rukuTxt : "-" }}</div>
             <div>
@@ -147,9 +155,7 @@
       </div>
       <div class="conten">
         <div class="daochu">
-          <el-button size="small" @click="record"
-            >操作记录</el-button
-          >
+          <el-button size="small" @click="record">操作记录</el-button>
           <el-button size="small" @click="exPdf">导 出</el-button>
         </div>
 
@@ -203,7 +209,8 @@
                 <span>文物级别：</span>{{ myObj.level ? myObj.level : "-" }}
               </div>
               <div>
-                <span>文物来源：</span>{{ myObj.sourceName ? myObj.sourceName : "-" }}
+                <span>文物来源：</span
+                >{{ myObj.sourceName ? myObj.sourceName : "-" }}
               </div>
             </div>
             <div class="row">
@@ -275,6 +282,14 @@
             </div>
             <div class="row">
               <div>
+                <span style="width: 80px">来源说明：</span>
+                <p style="flex: 1">
+                  {{ myObj.description ? myObj.description : "-" }}
+                </p>
+              </div>
+            </div>
+            <div class="row">
+              <div>
                 <span>入库位置：</span>
                 <el-cascader
                   ref="cascaderAddr"
@@ -316,7 +331,7 @@
               style="width: 100%"
             >
               <el-table-column
-              :resizable="false"
+                :resizable="false"
                 label="缩略图"
                 width="160"
                 v-if="this.resource === 'img'"
@@ -331,10 +346,16 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="name" label="附件名称" :resizable="false"> </el-table-column>
+              <el-table-column prop="name" label="附件名称" :resizable="false">
+              </el-table-column>
               <!-- <el-table-column prop="address" label="附件说明" ></el-table-column> -->
               <!-- <el-table-column prop="name" label="上传人" width="360"> </el-table-column> -->
-              <el-table-column prop="updateTime" label="上传时间" width="360" :resizable="false">
+              <el-table-column
+                prop="updateTime"
+                label="上传时间"
+                width="360"
+                :resizable="false"
+              >
               </el-table-column>
               <el-table-column label="操作" width="360" :resizable="false">
                 <template #default="{ row }">
@@ -380,17 +401,22 @@
           </template>
         </el-table-column>
         <el-table-column
-        :resizable="false"
+          :resizable="false"
           property="moduleNum"
           label="业务单号"
         ></el-table-column>
         <el-table-column
-        :resizable="false"
+          :resizable="false"
           property="tempType"
           label="业务类型"
           width="150"
         ></el-table-column>
-        <el-table-column property="updateTime" label="完成时间" width="220" :resizable="false"></el-table-column>
+        <el-table-column
+          property="updateTime"
+          label="完成时间"
+          width="220"
+          :resizable="false"
+        ></el-table-column>
         <el-table-column label="操作" width="120" :resizable="false">
           <template #default="{ row }">
             <el-button type="text" @click="lookRZ(row)">查 看</el-button>
@@ -480,7 +506,7 @@ export default {
       const res = await getRecord(data)
       this.total = res.data.total
       this.gridData = res.data.list
-      this.gridData.forEach(v => {
+      this.gridData.forEach((v) => {
         if (v.moduleType === 'register') v.tempType = '藏品登记'
         else if (v.moduleType === 'storageIn') v.tempType = '藏品入库'
         else if (v.moduleType === 'storageOut') v.tempType = '藏品出库'
@@ -639,7 +665,7 @@ body .el-table::before {
 }
 //@import url(); 引入公共css类
 .holding3_look {
-  /deep/.el-table__body-wrapper{
+  /deep/.el-table__body-wrapper {
     max-height: 500px;
     overflow-y: auto;
   }
@@ -694,6 +720,8 @@ body .el-table::before {
   }
   .info {
     margin: 10px 0 0 55px;
+    max-height: 370px;
+    overflow-y: auto;
     width: 90%;
     // margin-bottom: 60px;
     .row {
@@ -712,9 +740,10 @@ body .el-table::before {
       display: flex;
       align-items: center;
       & > div {
-        padding-left: 20px;
+        // padding-left: 20px;
         flex: 1;
-        height: 33px;
+        padding: 8px 20px;
+        // height: 33px;
         display: flex;
         align-items: center;
         border: 1px solid #ccc;
@@ -737,12 +766,12 @@ body .el-table::before {
     #myPdfCon {
       & > img {
         max-width: 800px;
-        max-height: 320px;
+        max-height: 270px;
       }
       padding: 20px 0;
       background-color: #fff;
       text-align: center;
-      margin: 100px auto;
+      margin: 10px auto;
       width: 1000px;
     }
   }

src/views/holding/holding4_audit.vue

@@ -92,6 +92,7 @@ export default {
       myObj: {},
       // 字典
       dictionaries: {
+        description: '来源说明',
         age: '年代',
         amount: '具体数量',
         amountType: '数量类型',

src/views/holding/holding4_audit_Dia.vue

@@ -55,6 +55,9 @@
               <div><span>具体质量：</span>{{ myObj.quality?myObj.quality:'-' }}</div>
             </div>
             <div class="row">
+              <div><span>藏品来源：</span>{{ myObj.description?myObj.description:'-' }}</div>
+            </div>
+            <div class="row">
               <div><span>入藏时间范围：</span>{{ myObj.checkInScope?myObj.checkInScope:'-' }}</div>
               <div><span>入藏年度：</span>{{ myObj.checkInYear?myObj.checkInYear:'-' }}</div>
             </div>

src/views/holding/holding4_look.vue

@@ -73,6 +73,7 @@ export default {
       myObj: {},
       // 字典
       dictionaries: {
+        description: '来源说明',
         age: '年代',
         amount: '具体数量',
         amountType: '数量类型',

src/views/home/index.vue

@@ -84,10 +84,10 @@ import { PieChart } from 'echarts/charts'
 import { LabelLayout } from 'echarts/features'
 import { CanvasRenderer } from 'echarts/renderers'
 
-import { getList as collect3 } from '@/apis/collect3'
+// import { getList as collect3 } from '@/apis/collect3'
 import { getList as getList4 } from '@/apis/holding4'
-import { getList as collect2 } from '@/apis/collect2'
-import { getList as collect1 } from '@/apis/collect1'
+// import { getList as collect2 } from '@/apis/collect2'
+// import { getList as collect1 } from '@/apis/collect1'
 import { getList as getList5 } from '@/apis/holding5'
 import { getList as getList2 } from '@/apis/holding2'
 import { getList as getList1 } from '@/apis/holding1'
@@ -108,20 +108,20 @@ export default {
         { name: '出库管理', inoc: 'holding2', push: '/layout/holding2' }
       ],
       info2: [
-        { name: '藏品注销', inoc: 'holding5', push: '/layout/holding5' },
-        { name: '征集品总账', inoc: 'collect0', push: '/layout/collect0' },
-        { name: '征集品提用', inoc: 'collect1', push: '/layout/collect1' },
-        { name: '征集品注销', inoc: 'collect2', push: '/layout/collect2' }
+        { name: '藏品注销', inoc: 'holding5', push: '/layout/holding5' }
+        // { name: '征集品总账', inoc: 'collect0', push: '/layout/collect0' },
+        // { name: '征集品提用', inoc: 'collect1', push: '/layout/collect1' },
+        // { name: '征集品注销', inoc: 'collect2', push: '/layout/collect2' }
       ],
       dingdong: [
         { name: '藏品登记', inoc: 0, push: '/layout/holding0' },
         { name: '入库管理', inoc: 0, push: '/layout/holding1' },
         { name: '出库管理', inoc: 0, push: '/layout/holding2' },
         { name: '藏品修改', inoc: 0, push: '/layout/holding4' },
-        { name: '藏品注销', inoc: 0, push: '/layout/holding5' },
-        { name: '征集品提用', inoc: 0, push: '/layout/collect1' },
-        { name: '征集品修改', inoc: 0, push: '/layout/collect3' },
-        { name: '征集品注销', inoc: 0, push: '/layout/collect2' }
+        { name: '藏品注销', inoc: 0, push: '/layout/holding5' }
+        // { name: '征集品提用', inoc: 0, push: '/layout/collect1' },
+        // { name: '征集品修改', inoc: 0, push: '/layout/collect3' },
+        // { name: '征集品注销', inoc: 0, push: '/layout/collect2' }
 
       ]
     }
@@ -212,20 +212,20 @@ export default {
       if (v.status === 1 || v.status === 0) this.dingdong[4].inoc++
     })
     // 进页面拿数据--征集品提用
-    const col1 = await collect1({ pageNum: 1, pageSize: 99999 })
-    col1.data.list.forEach(v => {
-      if (v.status === 1 || v.status === 0 || v.status === 3) this.dingdong[5].inoc++
-    })
+    // const col1 = await collect1({ pageNum: 1, pageSize: 99999 })
+    // col1.data.list.forEach(v => {
+    //   if (v.status === 1 || v.status === 0 || v.status === 3) this.dingdong[5].inoc++
+    // })
     // 进页面拿数据--征集品修改
-    const col3 = await collect3({ pageNum: 1, pageSize: 99999 })
-    col3.data.list.forEach(v => {
-      if (v.status === 1) this.dingdong[6].inoc++
-    })
+    // const col3 = await collect3({ pageNum: 1, pageSize: 99999 })
+    // col3.data.list.forEach(v => {
+    //   if (v.status === 1) this.dingdong[6].inoc++
+    // })
     // 进页面拿数据--征集品注销
-    const col2 = await collect2({ pageNum: 1, pageSize: 99999 })
-    col2.data.list.forEach(v => {
-      if (v.status === 1 || v.status === 0) this.dingdong[7].inoc++
-    })
+    // const col2 = await collect2({ pageNum: 1, pageSize: 99999 })
+    // col2.data.list.forEach(v => {
+    //   if (v.status === 1 || v.status === 0) this.dingdong[7].inoc++
+    // })
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

src/views/layout/index.vue

@@ -130,16 +130,16 @@ export default {
             { name: '藏品注销', id: 5 }
           ]
         },
-        {
-          name: '征集管理',
-          push: '/layout/collect',
-          son: [
-            { name: '征集品总账', id: 0 },
-            { name: '征集品提用', id: 1 },
-            { name: '征集品修改', id: 3 },
-            { name: '征集品注销', id: 2 }
-          ]
-        },
+        // {
+        //   name: '征集管理',
+        //   push: '/layout/collect',
+        //   son: [
+        //     { name: '征集品总账', id: 0 },
+        //     { name: '征集品提用', id: 1 },
+        //     { name: '征集品修改', id: 3 },
+        //     { name: '征集品注销', id: 2 }
+        //   ]
+        // },
         {
           name: '库房管理',
           push: '/layout/statistics',