出入库/档案详情-库房位置

src/views/archivesManage/archivesList/module/archivesInfo/index.vue

@@ -21,7 +21,24 @@
           <el-row v-if="isDetailsInfo">
             <el-col v-for="(item,index) in archivesDetailsData.slice(archivesDetailsData.length-5,archivesDetailsData.length)" :key="'last'+index" :span=" 12" class="base-info-item">
               <span>{{ item.fieldCnName }}：</span>
-              <p :style="{ width: item.editLength+'px'}" :class="[ (item.fieldName === 'borrow_type') ? 'row-state row-lending' : '' ]">{{ item.context }}</p>
+              <div v-if="item.fieldName === 'folder_location' && item.context" :style="{ width: item.editLength+'px', marginTop:'-6px'}">
+                <div v-if="item.context.indexOf(',')">
+                  <el-tag
+                    v-for="(val,key) in item.context.split(',')"
+                    :key="key"
+                    :type="val"
+                    effect="dark"
+                  >
+                    {{ val }}
+                  </el-tag>
+                </div>
+                <div v-else-if="!item.context.indexOf(',')">
+                  <el-tag effect="dark">{{ item.context }}</el-tag>
+                </div>
+              </div>
+              <div v-else :style="{ width: item.editLength+'px'}" :class="[ (item.fieldName === 'borrow_type') ? 'row-state row-lending' : '' ]">
+                {{ item.context }}
+              </div>
             </el-col>
           </el-row>
         </div>
@@ -224,5 +241,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/assets/styles/archives-manage.scss";
-
+.base-info .base-info-item span.el-tag{
+  width: auto;
+}
 </style>

src/views/archivesManage/outInStorage/module/detailDialog.vue

@@ -4,20 +4,36 @@
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
-        <div class="msg-top">
+        <div v-if="rowData" class="msg-top">
           <div class="dpflex">
             <p class="left"><span class="color-blue">盒名称:</span><span class="color-white">{{ rowData.caseName }}</span></p>
-            <p class="right"><span class="color-blue">存放位置:</span><span class="color-white">{{ rowData.folderLocationDetails }}</span></p>
+            <p class="right"><span class="color-blue">存放位置:</span>
+              <span class="color-white">
+                <div v-if="rowData.folderLocationDetails.indexOf(',')">
+                  <el-tag
+                    v-for="(item,index) in rowData.folderLocationDetails.split(',')"
+                    :key="index"
+                    :type="item"
+                    effect="dark"
+                  >
+                    {{ item }}
+                  </el-tag>
+                </div>
+                <div v-else>
+                  <el-tag effect="dark">{{ rowData.folderLocationDetails }}</el-tag>
+                </div>
+              </span>
+            </p>
           </div>
           <div class="dpflex">
-            <p class="left"><span class="color-blue">条形码:</span><span class="color-white">{{ rowData.barcode }}</span></p>
+            <p class="left"><span class="color-blue">条形码:</span><span v-if="rowData.barcode" class="color-white">{{ rowData.barcode }}</span></p>
             <p class="right"><span class="color-blue">TID:</span><span class="color-white">{{ rowData.tid }}</span></p>
           </div>
           <div class="dpflex">
             <p class="left"><span class="color-blue">创建时间:</span><span class="color-white">{{ rowData.create_time| parseTime }}</span></p>
           </div>
         </div>
-        <el-table :data="tableData" style="height:359px">
+        <el-table :data="tableData" height="348px">
           <el-table-column type="index" label="序号" align="center" width="90" />
           <el-table-column prop="child" align="center" label="子条数目" width="100" />
           <el-table-column prop="categoryType" align="center" label="门类级别" width="140">
@@ -37,8 +53,8 @@
           <el-table-column prop="department" align="center" label="部门" width="100" />
           <el-table-column prop="caseName" align="center" label="盒名称" width="140" />
           <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="300">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+            <template v-if="rowData" slot-scope="">
+              <el-tag effect="dark">{{ rowData.folderLocationDetails }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="update_time" align="center" label="创建时间" width="180">
@@ -57,7 +73,7 @@ export default {
   data() {
     return {
       detailVisible: false,
-      rowData: {},
+      rowData: null,
       tableData: []
     }
   }

src/views/archivesManage/outInStorage/outInHistory/index.vue

@@ -181,18 +181,19 @@ export default {
       exportFile(this.baseApi + '/api/storage/exportStorageLogList?' + qs.stringify(params, { indices: false }))
     },
     // 双击 详情
-    async handleDbClick(row) {
-      this.$refs.detailDom.rowData = row
+    handleDbClick(row) {
       const params = {
         'logId': row.id
       }
       // 调取详情接口
       initStorageLogDetailes(params).then(res => {
         this.$refs.detailDom.tableData = res
-      })
+        this.$nextTick(() => {
           this.$refs.detailDom.detailVisible = true
+          this.$refs.detailDom.rowData = row
+        })
+      })
     }
-
   }
 }
 </script>

src/views/archivesManage/outInStorage/outStorage/index.vue

@@ -146,14 +146,15 @@ export default {
     // },
     // 双击 详情
     handleDbClick(row) {
-      console.log(1)
-      this.$refs.detailDom.rowData = row
       const params = {
         caseId: row.id
       }
       initStorageDetailes(params).then(res => {
         this.$refs.detailDom.tableData = res.archivesSummaries
+        this.$nextTick(() => {
           this.$refs.detailDom.detailVisible = true
+          this.$refs.detailDom.rowData = row
+        })
       })
     },
     selectionChangeHandler(val) {