cloud-web-corejs 1.0.54-dev.80 → 1.0.54-dev.800

package/src/components/fileLibrary/mixins/propertiesDialogMixins.js

@@ -19,10 +19,14 @@ modules = {
       falseValue: false,
       vxeOption: {},
       showContent: true,
-      attachmentDTO: {},
+      attachmentDTO: {
+        fileAttachAttributeDTOs:[]
+      },
+      fileAttachObjDTOs:[],
       // current_prefix: '',
       filePrefix: '',
-      fileName: ''
+      fileName: '',
+      vxeOption2:{}
     };
   },
   watch: {
@@ -48,6 +52,7 @@ modules = {
   mounted() {
     this.getData();
     this.initTableM1();
+    this.initTableM2();
   },
   methods: {
     initFilePrefix() {
@@ -92,9 +97,10 @@ modules = {
     },
     reloadContent() {
       this.getAttributes();
+      this.getObjs();
     },
     getData() {
-      this.$http({
+      this.$commonHttp({
         url: this.current_prefix + '/file_obj/get',
         method: 'post',
         data: {
@@ -105,6 +111,7 @@ modules = {
         success: res => {
           this.attachmentDTO = res.objx || {};
           this.getAttributes();
+          this.getObjs();
         }
       });
     },
@@ -122,6 +129,21 @@ modules = {
         }
       });
     },
+    getObjs() {
+      this.$http({
+        url: this.current_prefix + '/file_attach/obj/list',
+        method: 'post',
+        data: {
+          stringOne: this.attachmentDTO.fileSn
+        },
+        isLoading: true,
+        // modalStrictly: true,
+        success: res => {
+          // this.$set(this.attachmentDTO, 'fileAttachObjDTOs', res.objx || []);
+          this.fileAttachObjDTOs = res.objx || []
+        }
+      });
+    },
     initTableM1() {
       //明细
       var that = this;
@@ -188,6 +210,43 @@ modules = {
         temp = temp.toFixed(2);
         return temp + 'GB';
       }
+    },
+    initTableM2() {
+      //明细
+      var that = this;
+      const tableRef = 'table-m2';
+      const tableOption = {
+        vue: this,
+        tableRef: tableRef,
+        tableName: 'user_fileLibrary_propertiesDialog_list-m2',
+        columns: [
+          {
+            type: 'checkbox',
+            fixed: 'left',
+            width: 48,
+            resizable: false
+          },
+          {
+            title: this.$t1('关联对象编码'),
+            field: 'objSn',
+            width: 200
+          },
+          {
+            title: this.$t1('关联对象名称'),
+            field: 'objName',
+            width: 200
+          },
+          {
+            width: 50,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption2 = opts;
+      });
     }
   }
 };

package/src/components/fileLibrary/mixins/recycleBinDialogMixins.js

@@ -1,4 +1,4 @@
-import ElImageViewer from '../../../components/VabUpload/image-viewer';
+import ElImageViewer from '@base/components/VabUpload/image-viewer';
 import recycleBinPropertiesDialog from "../recycleBinPropertiesDialog";
 import categoryMoveDialog from '../categoryMoveDialog'
 
@@ -253,7 +253,7 @@ modules = {
         current: 1,
         size: this.pageSize
       };
-      this.$http({
+      this.$commonHttp({
         method: 'post',
         url: this.current_prefix + '/file_recovery/listPage',
         data: {
@@ -367,7 +367,7 @@ modules = {
             field: "fileSn",
             width: 150
           },
-          {title: this.$t2('删除人', 'components.fileLibrary.deleteBy'), field: 'createBy', width: 150},
+          {title: this.$t2('删除人', 'components.fileLibrary.deleteBy'), field: '_createBy', width: 150},
           {
             field: 'createDate',
             title: this.$t2('删除时间', 'components.fileLibrary.deleteDate'),

package/src/components/fileLibrary/propertiesDialog.vue

@@ -1,145 +1,190 @@
-<template>
-  <el-dialog
-    :title="$t2('文件详情','components.fileLibrary.fileDetail')"
-    :append-to-body="true"
-    :modal-append-to-body="falseValue"
-    :close-on-click-modal="falseValue"
-    :visible.sync="showDialog"
-    :modal="falseValue"
-    custom-class="dialog-style list-dialog"
-    width="700px"
-    height="500px"
-    @close="dialogClose"
-    v-el-drag-dialog
-    v-el-dialog-center
-  >
-    <div id="containt">
-      <div class="detail-wrap">
-        <el-form ref="editForm" :model="attachmentDTO">
-          <div class="d-header clearfix">
-            <div class="fl">
-              <i class="el-icon-info"/>
-              {{ $t2('文件详情', 'components.fileLibrary.fileDetail') }}
-            </div>
-            <div class="fr">
-              <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData"
-                         v-if="isEdit && attachmentDTO.status!=1">{{ $t2('保存', 'system.button.save') }}
-              </el-button>
-            </div>
-          </div>
-          <baseTabs>
-            <baseTabPane :label="$t2('基本信息','system.label.baseInfo')">
-              <template #default>
-                <table class="table-detail">
-                  <tbody>
-                  <tr>
-                    <th>{{ $t2('文件路径', 'components.fileLibrary.filePath') }}</th>
-                    <td colspan="3">
-                      <el-breadcrumb separator-class="el-icon-arrow-right">
-                        <el-breadcrumb-item v-for="(pathName,index) in pathNameArr" :key="index">{{
-                            pathName
-                          }}
-                        </el-breadcrumb-item>
-                      </el-breadcrumb>
-                    </td>
-                  </tr>
-                  <tr>
-                    <th>
-                      {{ $t2('文件名称', 'components.fileLibrary.fileName') }}
-                    </th>
-                    <td colspan="3">
-                      <el-input v-model="fileName" clearable v-if="isEdit">
-                        <template slot="append">{{ filePrefix }}</template>
-                      </el-input>
-                      <template v-else>{{ attachmentDTO.fileName }}</template>
-                    </td>
-                  </tr>
-                  <tr>
-                    <th>{{ $t2('所属对象描述', 'components.fileLibrary.note') }}</th>
-                    <td colspan="3">{{ attachmentDTO.note }}</td>
-                  </tr>
-                  <tr>
-                    <th>{{ $t2('文件大小', 'components.fileLibrary.fileSize') }}</th>
-                    <td>{{ formatFileSize(attachmentDTO.fileSize) }}</td>
-                    <th>{{ $t2('版本号', 'components.fileLibrary.fileRev') }}</th>
-                    <td>{{ attachmentDTO.rev }}</td>
-                  </tr>
-                  <tr>
-                    <th>{{ $t2('分辨率', 'components.fileLibrary.widthHeight') }}</th>
-                    <td>{{ attachmentDTO.widthHeight }}</td>
-                    <th>{{ $t2('是否归档', 'components.fileLibrary.status') }}</th>
-                    <td>{{ attachmentDTO.status == 1 ? "已归档" : "未归档" }}</td>
-                  </tr>
-                  <!--                  <tr>
-                                      <th>状态</th>
-                                      <td>{{ attachmentDTO.status == 1 ? '归档' : '未归档' }}</td>
-                                    </tr>-->
-                  <tr>
-                    <th>{{ $t2('文件编码', 'components.fileLibrary.fileSn') }}</th>
-                    <td colspan="3">{{ attachmentDTO.fileSn }}</td>
-                  </tr>
-                  <tr>
-                    <th>{{ $t2('创建人', 'system.label.createBy') }}</th>
-                    <td>{{ attachmentDTO.createBy }}</td>
-                    <th>{{ $t2('创建时间', 'system.label.createDate') }}</th>
-                    <td>{{ attachmentDTO.createDate }}</td>
-                  </tr>
-                  </tbody>
-                </table>
-              </template>
-            </baseTabPane>
-            <baseTabPane :label="$t2('文件属性','components.fileLibrary.fileAttribute')">
-              <template #button>
-                <el-button class="button-sty" @click="addItem" icon="el-icon-plus"
-                           v-if="isEdit && attachmentDTO.status!=1">
-                  {{ $t2('新增文件属性', 'components.fileLibrary.addFileAttribute') }}
-                </el-button>
-              </template>
-              <template #default>
-                <vxe-grid
-                  ref="table-m1"
-                  class="vxe-tableNo"
-                  height="224px"
-                  :data="attachmentDTO.fileAttachAttributeDTOs"
-                  v-bind="vxeOption"
-                  @resizable-change="$vxeTableUtil.onColumnWitchChange"
-                  @custom="$vxeTableUtil.customHandle"
-                >
-                  <template #attributeName="{row,rowIndex}">
-                    <el-form-item :prop="'fileAttachAttributeDTOs.' + rowIndex + '.attributeName'"
-                                  :rules="[{ required: true, trigger: 'blur' }]">
-                      <el-input v-model="row.attributeName" clearable v-if="isEdit"/>
-                      <template v-else>{{ row.attributeName }}</template>
-                    </el-form-item>
-                  </template>
-                  <template #attributeValue="{row}">
-                    <el-input v-model="row.attributeValue" clearable v-if="isEdit"/>
-                    <template v-else>{{ row.attributeValue }}</template>
-                  </template>
-                  <template #operate="{row,rowIndex}">
-                    <a class="a-link" @click="attachmentDTO.fileAttachAttributeDTOs.splice(rowIndex, 1)"
-                       v-if="isEdit">
-                      <el-tooltip :enterable="false" effect="dark"
-                                  :content="$t2('删除','components.fileLibrary.delete')" placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-delete"/>
-                      </el-tooltip>
-                    </a>
-                  </template>
-                </vxe-grid>
-              </template>
-            </baseTabPane>
-          </baseTabs>
-        </el-form>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import mixins from './mixins/propertiesDialogMixins';
-
-export default {
-  mixins: [mixins]
-};
-</script>
+<template>
+  <el-dialog
+    :title="$t2('文件详情', 'components.fileLibrary.fileDetail')"
+    :append-to-body="true"
+    :modal-append-to-body="falseValue"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog"
+    width="700px"
+    height="500px"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div id="containt">
+      <div class="detail-wrap" style="height:80vh">
+        <el-form ref="editForm" :model="attachmentDTO">
+          <div class="d-header clearfix">
+            <div class="fl">
+              <i class="el-icon-info" />
+              {{ $t2("文件详情", "components.fileLibrary.fileDetail") }}
+            </div>
+            <div class="fr">
+              <el-button
+                type="primary"
+                class="button-sty"
+                icon="el-icon-check"
+                @click="saveData"
+                v-if="isEdit && attachmentDTO.status != 1"
+                >{{ $t2("保存", "system.button.save") }}
+              </el-button>
+            </div>
+          </div>
+          <baseTabs>
+            <baseTabPane :label="$t2('基本信息', 'system.label.baseInfo')">
+              <template #default>
+                <table class="table-detail">
+                  <tbody>
+                    <tr>
+                      <th>{{ $t2("文件路径", "components.fileLibrary.filePath") }}</th>
+                      <td colspan="3">
+                        <el-breadcrumb separator-class="el-icon-arrow-right">
+                          <el-breadcrumb-item
+                            v-for="(pathName, index) in pathNameArr"
+                            :key="index"
+                            >{{ pathName }}
+                          </el-breadcrumb-item>
+                        </el-breadcrumb>
+                      </td>
+                    </tr>
+                    <tr>
+                      <th>
+                        {{ $t2("文件名称", "components.fileLibrary.fileName") }}
+                      </th>
+                      <td colspan="3">
+                        <el-input v-model="fileName" clearable v-if="isEdit">
+                          <template slot="append">{{ filePrefix }}</template>
+                        </el-input>
+                        <template v-else>{{ attachmentDTO.fileName }}</template>
+                      </td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t2("所属对象描述", "components.fileLibrary.note") }}</th>
+                      <td colspan="3">{{ attachmentDTO.note }}</td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t1("文件类型名") }}</th>
+                      <td colspan="3">
+                        <b>{{ attachmentDTO.fileTypeName }}</b>
+                      </td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t2("文件大小", "components.fileLibrary.fileSize") }}</th>
+                      <td>{{ formatFileSize(attachmentDTO.fileSize) }}</td>
+                      <th>{{ $t2("版本号", "components.fileLibrary.fileRev") }}</th>
+                      <td>{{ attachmentDTO.rev }}</td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t2("分辨率", "components.fileLibrary.widthHeight") }}</th>
+                      <td>{{ attachmentDTO.widthHeight }}</td>
+                      <th>{{ $t2("是否归档", "components.fileLibrary.status") }}</th>
+                      <td>{{ attachmentDTO.status == 1 ? "已归档" : "未归档" }}</td>
+                    </tr>
+                    <!--                  <tr>
+                                      <th>状态</th>
+                                      <td>{{ attachmentDTO.status == 1 ? '归档' : '未归档' }}</td>
+                                    </tr>-->
+                    <tr>
+                      <th>{{ $t2("文件编码", "components.fileLibrary.fileSn") }}</th>
+                      <td colspan="3">{{ attachmentDTO.fileSn }}</td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t1("作者") }}</th>
+                      <td>{{ attachmentDTO.fileAuthor }}</td>
+                      <th>{{ $t1("修订人") }}</th>
+                      <td>{{ attachmentDTO.fileReviser }}</td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t2("创建人", "system.label.createBy") }}</th>
+                      <td>{{ attachmentDTO._createBy }}</td>
+                      <th>{{ $t2("创建时间", "system.label.createDate") }}</th>
+                      <td>{{ attachmentDTO.createDate }}</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </template>
+            </baseTabPane>
+            <baseTabPane :label="$t2('文件属性', 'components.fileLibrary.fileAttribute')">
+              <template #button>
+                <el-button
+                  class="button-sty"
+                  @click="addItem"
+                  icon="el-icon-plus"
+                  v-if="isEdit && attachmentDTO.status != 1"
+                >
+                  {{ $t2("新增文件属性", "components.fileLibrary.addFileAttribute") }}
+                </el-button>
+              </template>
+              <template #default>
+                <vxe-grid
+                  ref="table-m1"
+                  class="vxe-tableNo"
+                  height="224px"
+                  :data="attachmentDTO.fileAttachAttributeDTOs"
+                  v-bind="vxeOption"
+                  @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                  @custom="$vxeTableUtil.customHandle"
+                >
+                  <template #attributeName="{ row, rowIndex }">
+                    <el-form-item
+                      :prop="'fileAttachAttributeDTOs.' + rowIndex + '.attributeName'"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <el-input v-model="row.attributeName" clearable v-if="isEdit" />
+                      <template v-else>{{ row.attributeName }}</template>
+                    </el-form-item>
+                  </template>
+                  <template #attributeValue="{ row }">
+                    <el-input v-model="row.attributeValue" clearable v-if="isEdit" />
+                    <template v-else>{{ row.attributeValue }}</template>
+                  </template>
+                  <template #operate="{ row, rowIndex }">
+                    <a
+                      class="a-link"
+                      @click="attachmentDTO.fileAttachAttributeDTOs.splice(rowIndex, 1)"
+                      v-if="isEdit"
+                    >
+                      <el-tooltip
+                        :enterable="false"
+                        effect="dark"
+                        :content="$t2('删除', 'components.fileLibrary.delete')"
+                        placement="top"
+                        popper-class="tooltip-skin"
+                      >
+                        <i class="el-icon-delete" />
+                      </el-tooltip>
+                    </a>
+                  </template>
+                </vxe-grid>
+              </template>
+            </baseTabPane>
+            <baseTabPane :label="$t1('文件关联对象')">
+              <template #button></template>
+              <template #default>
+                <vxe-grid
+                  ref="table-m2"
+                  class="vxe-tableNo"
+                  height="224px"
+                  :data="fileAttachObjDTOs"
+                  v-bind="vxeOption2"
+                  @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                  @custom="$vxeTableUtil.customHandle"
+                ></vxe-grid>
+              </template>
+            </baseTabPane>
+          </baseTabs>
+        </el-form>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import mixins from "./mixins/propertiesDialogMixins";
+
+export default {
+  mixins: [mixins],
+};
+</script>