cloud-web-corejs-haier 1.0.5 → 1.0.6

package/src/components/fileLibrary/fileObjAuthDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      title="设置权限"
+      :title="$t1('设置权限')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="false"
@@ -29,168 +29,260 @@
                   <template #form>
                     <div class="clearfix screen-btns">
                       <div class="fl">
-                        <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
-                                    @click="openSaleOrgAddDialog">
-                          新增机构
+                        <vxe-button
+                          status="primary"
+                          class="button-sty"
+                          icon="el-icon-plus"
+                          @click="openSaleOrgAddDialog"
+                        >
+                          {{ $t1("新增机构") }}
                         </vxe-button>
-                        <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
-                                    @click="openPositionAddDialog">
-                          新增岗位
+                        <vxe-button
+                          status="primary"
+                          class="button-sty"
+                          icon="el-icon-plus"
+                          @click="openPositionAddDialog"
+                        >
+                          {{ $t1("新增岗位") }}
                         </vxe-button>
-                        <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openUserAddDialog">
-                          新增用户
+                        <vxe-button
+                          status="primary"
+                          class="button-sty"
+                          icon="el-icon-plus"
+                          @click="openUserAddDialog"
+                        >
+                          {{ $t1("新增用户") }}
                         </vxe-button>
-                        <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openRoleAddDialog">
-                          新增角色
+                        <vxe-button
+                          status="primary"
+                          class="button-sty"
+                          icon="el-icon-plus"
+                          @click="openRoleAddDialog"
+                        >
+                          {{ $t1("新增角色") }}
                         </vxe-button>
                         <!--                      <vxe-button type="text" status="primary" plain class="button-sty" icon="el-icon-delete"
                                                           @click="deleteRows()">{{ $t2('删除', 'components.fileLibrary.delete') }}
                                               </vxe-button>-->
                       </div>
-                      <div class="fl screen-breadcrumb" style="margin-left: 30px;">
-                        <span style="font-size: 12px;">{{ $t2('文件路径', 'components.fileLibrary.filePath') }}：</span>
+                      <div class="fl screen-breadcrumb" style="margin-left: 30px">
+                        <span style="font-size: 12px"
+                          >{{
+                            $t2("文件路径", "components.fileLibrary.filePath")
+                          }}：</span
+                        >
                         <el-breadcrumb separator-class="el-icon-arrow-right">
-                          <el-breadcrumb-item v-for="(treeNode,index) in treeNodeArr" :key="index">{{
-                              treeNode.label
-                            }}
+                          <el-breadcrumb-item
+                            v-for="(treeNode, index) in treeNodeArr"
+                            :key="index"
+                            >{{ treeNode.label }}
                           </el-breadcrumb-item>
                         </el-breadcrumb>
                       </div>
                     </div>
                   </template>
-                  <template #saleOrg="{row,rowIndex}">
+                  <template #saleOrg="{ row, rowIndex }">
                     <el-input
                       class="search-input"
                       v-model="row.saleOrgName"
                       clearable
-                      @clear="
-                  row.saleOrgId = null;
-                "
+                      @clear="row.saleOrgId = null"
                       v-if="!row._isParent"
                       v-el-readonly
                     >
-                      <i slot="suffix" class="el-input__icon el-icon-search"
-                         @click="openSaleOrgRowDialog(row,rowIndex)"></i>
+                      <i
+                        slot="suffix"
+                        class="el-input__icon el-icon-search"
+                        @click="openSaleOrgRowDialog(row, rowIndex)"
+                      ></i>
                     </el-input>
                     <template v-else>{{ row.saleOrgName }}</template>
                   </template>
-                  <template #position="{row,rowIndex}">
+                  <template #position="{ row, rowIndex }">
                     <el-input
                       class="search-input"
                       v-model="row.positionName"
                       clearable
-                      @clear="
-                  row.positionId = null;
-                "
+                      @clear="row.positionId = null"
                       v-if="!row._isParent"
                       v-el-readonly
                     >
-                      <i slot="suffix" class="el-input__icon el-icon-search"
-                         @click="openPositionRowDialog(row,rowIndex)"></i>
+                      <i
+                        slot="suffix"
+                        class="el-input__icon el-icon-search"
+                        @click="openPositionRowDialog(row, rowIndex)"
+                      ></i>
                     </el-input>
                     <template v-else>{{ row.positionName }}</template>
                   </template>
-                  <template #role="{row,rowIndex}">
+                  <template #role="{ row, rowIndex }">
                     <el-input
                       class="search-input"
                       v-model="row.roleName"
                       clearable
-                      @clear="
-                  row.roleId = null;
-                "
+                      @clear="row.roleId = null"
                       v-if="!row._isParent"
                       v-el-readonly
                     >
-                      <i slot="suffix" class="el-input__icon el-icon-search"
-                         @click="openRoleRowDialog(row,rowIndex)"></i>
+                      <i
+                        slot="suffix"
+                        class="el-input__icon el-icon-search"
+                        @click="openRoleRowDialog(row, rowIndex)"
+                      ></i>
                     </el-input>
                     <template v-else>{{ row.roleName }}</template>
                   </template>
-                  <template #user="{row,rowIndex}">
+                  <template #user="{ row, rowIndex }">
                     <el-input
                       class="search-input"
                       v-model="row.nickName"
                       clearable
-                      @clear="
-                  row.userId = null;
-                "
+                      @clear="row.userId = null"
                       v-if="!row._isParent"
                       v-el-readonly
                     >
-                      <i slot="suffix" class="el-input__icon el-icon-search"
-                         @click="openUserRowDialog(row,rowIndex)"></i>
+                      <i
+                        slot="suffix"
+                        class="el-input__icon el-icon-search"
+                        @click="openUserRowDialog(row, rowIndex)"
+                      ></i>
                     </el-input>
                     <template v-else>{{ row.nickName }}</template>
                   </template>
-                  <template #operate="{row}">
+                  <template #operate="{ row }">
                     <a
                       href="javascript:void(0);"
                       class="a-link"
                       @click="openEditDialog(row.id)"
                     >
-                      <el-tooltip :enterable="false" effect="dark" :content="$t2('查看','common.view')" placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
+                      <el-tooltip
+                        :enterable="false"
+                        effect="dark"
+                        :content="$t2('查看', 'common.view')"
+                        placement="top"
+                        popper-class="tooltip-skin"
+                      >
+                        <i class="el-icon-edit" />
                       </el-tooltip>
                     </a>
                   </template>
                 </vxe-grid>
               </div>
             </el-tab-pane>
-            <el-tab-pane :label="$t1('文件操作，发系统通知')" name="second" v-if="fileStoreArea.toNotify">
+            <el-tab-pane
+              :label="$t1('文件操作，发系统通知')"
+              name="second"
+              v-if="fileStoreArea.toNotify"
+            >
               <div class="grid-height" style="height: 500px">
-                <fileObjNotifyEdit v-if="showFileObjNotifyEdit" visible-key="showFileObjNotifyEdit"
-                                   :current_prefix="current_prefix" :_dataId="fileObjId" :parent-target="_self"
-                                   @reload="$reloadHandle"></fileObjNotifyEdit>
+                <fileObjNotifyEdit
+                  v-if="showFileObjNotifyEdit"
+                  visible-key="showFileObjNotifyEdit"
+                  :current_prefix="current_prefix"
+                  :_dataId="fileObjId"
+                  :parent-target="_self"
+                  @reload="$reloadHandle"
+                ></fileObjNotifyEdit>
               </div>
             </el-tab-pane>
           </el-tabs>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-			<el-button type="primary" plain class="button-sty" @click="dialogClose">
-				<i class="el-icon-close el-icon"></i>
-				取 消
-			</el-button>
-			<el-button type="primary" @click="saveData" class="button-sty" v-if="activeName=='first'">
-				<i class="el-icon-check el-icon"></i>
-				确 定
-			</el-button>
-		</span>
+        <el-button type="primary" plain class="button-sty" @click="dialogClose">
+          <i class="el-icon-close el-icon"></i>
+          {{ $t2("取 消", "system.button.cancel2") }}
+        </el-button>
+        <el-button
+          type="primary"
+          @click="saveData"
+          class="button-sty"
+          v-if="activeName == 'first'"
+        >
+          <i class="el-icon-check el-icon"></i>
+          {{ $t2("确 定", "system.button.confirm2") }}
+        </el-button>
+      </span>
     </el-dialog>
 
-    <fileObjAuthEditDialog v-if="showDetailDialog" :visiable.sync="showDetailDialog" @confirm="confirmDetailDialog"
-                           :treeNodeArr="treeNodeArr" :currentRow="currentRow"></fileObjAuthEditDialog>
+    <fileObjAuthEditDialog
+      v-if="showDetailDialog"
+      :visiable.sync="showDetailDialog"
+      @confirm="confirmDetailDialog"
+      :treeNodeArr="treeNodeArr"
+      :currentRow="currentRow"
+    ></fileObjAuthEditDialog>
 
+    <userDialog
+      v-if="showUserDialog"
+      :visiable.sync="showUserDialog"
+      @confirm="confirmInsertUser"
+      multi="false"
+    />
+    <saleOrgDialog
+      v-if="showSaleOrgDialog"
+      :visiable.sync="showSaleOrgDialog"
+      @confirm="confirmInsertSaleOrg"
+      multi="false"
+    />
+    <positionDialog
+      v-if="showPositionDialog"
+      :visiable.sync="showPositionDialog"
+      @confirm="confirmInsertPosition"
+      multi="false"
+    />
 
-    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmInsertUser"
-                multi="false"/>
-    <saleOrgDialog v-if="showSaleOrgDialog" :visiable.sync="showSaleOrgDialog" @confirm="confirmInsertSaleOrg"
-                   multi="false"/>
-    <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" @confirm="confirmInsertPosition"
-                    multi="false"/>
+    <userDialog
+      v-if="showUserRowDialog"
+      :visiable.sync="showUserRowDialog"
+      @confirm="confirmtUserRow"
+      multi="false"
+    />
+    <saleOrgDialog
+      v-if="showSaleOrgRowDialog"
+      :visiable.sync="showSaleOrgRowDialog"
+      @confirm="confirmSaleOrgRow"
+      multi="false"
+    />
+    <positionDialog
+      v-if="showPositionRowDialog"
+      :visiable.sync="showPositionRowDialog"
+      @confirm="confirmPositionRow"
+      multi="false"
+    />
 
+    <roleDialog
+      v-if="showRoleRowDialog"
+      :visiable.sync="showRoleRowDialog"
+      @confirm="confirmRoleRow"
+      multi="false"
+    />
 
-    <userDialog v-if="showUserRowDialog" :visiable.sync="showUserRowDialog" @confirm="confirmtUserRow"
-                multi="false"/>
-    <saleOrgDialog v-if="showSaleOrgRowDialog" :visiable.sync="showSaleOrgRowDialog" @confirm="confirmSaleOrgRow"
-                   multi="false"/>
-    <positionDialog v-if="showPositionRowDialog" :visiable.sync="showPositionRowDialog" @confirm="confirmPositionRow"
-                    multi="false"/>
+    <userDialog
+      v-if="showUserAddDialog"
+      :visiable.sync="showUserAddDialog"
+      @confirm="confirmtUserAddDialog"
+      multi="true"
+    />
+    <saleOrgDialog
+      v-if="showSaleOrgAddDialog"
+      :visiable.sync="showSaleOrgAddDialog"
+      @confirm="confirmSaleOrgAddDialog"
+      multi="true"
+    />
+    <positionDialog
+      v-if="showPositionAddDialog"
+      :visiable.sync="showPositionAddDialog"
+      @confirm="confirmPositionAddDialog"
+      multi="true"
+    />
 
-    <roleDialog v-if="showRoleRowDialog" :visiable.sync="showRoleRowDialog" @confirm="confirmRoleRow"
-                multi="false"/>
-
-    <userDialog v-if="showUserAddDialog" :visiable.sync="showUserAddDialog" @confirm="confirmtUserAddDialog"
-                multi="true"/>
-    <saleOrgDialog v-if="showSaleOrgAddDialog" :visiable.sync="showSaleOrgAddDialog" @confirm="confirmSaleOrgAddDialog"
-                   multi="true"/>
-    <positionDialog v-if="showPositionAddDialog" :visiable.sync="showPositionAddDialog"
-                    @confirm="confirmPositionAddDialog"
-                    multi="true"/>
-
-    <roleDialog v-if="showRoleAddDialog" :visiable.sync="showRoleAddDialog" @confirm="confirmRoleAddDialog"
-                multi="true"/>
+    <roleDialog
+      v-if="showRoleAddDialog"
+      :visiable.sync="showRoleAddDialog"
+      @confirm="confirmRoleAddDialog"
+      multi="true"
+    />
   </div>
 </template>
 
@@ -199,10 +291,8 @@ import mixin from "./mixins/fileObjAuthDialogMixin";
 
 export default {
   name: "fileObjAuthDialog",
-  mixins: [mixin]
-}
+  mixins: [mixin],
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/fileLibrary/filterDialog.vue

@@ -15,17 +15,25 @@
     <div class="cont">
       <div id="containt" style="height: 550px">
         <div class="search-criteria fl" style="width: 220px; height: 100%">
-          <div class="tit"><i class="iconfont icon-shaixuan"></i><b>搜索条件</b></div>
+          <div class="tit">
+            <i class="iconfont icon-shaixuan"></i><b>{{ $t1("搜索条件") }}</b>
+          </div>
 
           <el-form label-position="top">
             <div style="height: 468px; padding-top: 10px; overflow: auto">
+              <el-form-item :label="$t1('搜索类型')">
+                <el-radio-group v-model="fileType">
+                  <el-radio :label="2">{{ $t1("文件夹") }}</el-radio>
+                  <el-radio :label="1">{{ $t1("文件") }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
               <el-form-item label="文件名">
                 <el-input v-model="formData.fileName" size="small" clearable />
               </el-form-item>
               <!--              <el-form-item label="所属对象描述">
                 <base-input-batch v-model="formData.note"/>
               </el-form-item>-->
-              <el-form-item label="创建时间">
+              <el-form-item :label="$t1('创建时间')">
                 <el-date-picker
                   v-model="formData.startTime"
                   type="date"
@@ -46,7 +54,7 @@
                   :picker-options="$baseEndPickerOptions(formData.startTime)"
                 ></el-date-picker>
               </el-form-item>
-              <el-form-item label="文件类型">
+              <!-- <el-form-item :label="$t1('文件类型')">
                 <el-select v-model="fileTypeSn" @change="getAttributeList">
                   <el-option
                     v-for="(item, index) in fileTypes"
@@ -55,7 +63,7 @@
                     :value="item.fileTypeSn"
                   ></el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item
                 v-for="(item, index) in fileAttributes"
                 :key="index"
@@ -71,14 +79,14 @@
                 @click="resetEvent"
                 type="primary"
                 plain
-                >重置
+                >{{ $t1("重置") }}
               </el-button>
               <el-button
                 type="warning"
                 icon="el-icon-search"
                 class="button-sty"
                 @click="searchEvent"
-                >搜索
+                >{{ $t1("搜索") }}
               </el-button>
             </el-form-item>
           </el-form>
@@ -103,7 +111,9 @@
                     <el-breadcrumb separator-class="el-icon-arrow-right ">
                       <el-breadcrumb-item
                         ><i class="iconfont icon-dingwei-mianxing"></i
-                        ><span class="f-blue" @click="checkTreeNode()">搜索范围</span>
+                        ><span class="f-blue" @click="checkTreeNode()">{{
+                          $t1("搜索范围")
+                        }}</span>
                       </el-breadcrumb-item>
                       <el-breadcrumb-item
                         v-for="(treeNode, index) in treeNodeArr"
@@ -115,18 +125,11 @@
                       </el-breadcrumb-item>
                     </el-breadcrumb>
                   </div>
-                  <div class="fr">
-                    <!--                    <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text"
-                                                    status="primary"
-                                                    plain>重置
-                                        </vxe-button>
-                                        <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
-                                        </vxe-button>-->
-                  </div>
+                  <div class="fr"></div>
                 </div>
               </template>
               <template #fileName="{ row }">
-                <div>
+                <div v-if="!row.dirs">
                   <el-tooltip
                     :enterable="false"
                     effect="dark"
@@ -141,6 +144,13 @@
                     row.fileName
                   }}</a>
                 </div>
+                <div v-else>
+                  <a class="a-link img">
+                    <div class="img">
+                      <svg-icon icon-class="ico-wenjianjia" />{{ row.fileName }}
+                    </div>
+                  </a>
+                </div>
               </template>
             </vxe-grid>
           </div>
@@ -157,7 +167,7 @@ import { treeScollx, treeScolly } from "@base/utils/global.js";
 import { encode } from "js-base64";
 
 export default {
-  name: "productDialog",
+  name: "fileLibraryFilterDialog",
   props: ["visiable", "multi", "rows", "treeNodeArr", "currentFileCategory"],
   mixins: [selectDialogMixins],
   inject: ["current_prefix", "storeAreaCode", "getObjectForeignId", "getIsPrivate"],
@@ -186,6 +196,7 @@ export default {
       fileAttributes: [],
       fileTypeSn: null,
       fileAttachAttributeCDTos: [],
+      fileType: 1,
     };
   },
   methods: {
@@ -196,7 +207,15 @@ export default {
         vue: that,
         tableRef: "table-m1",
         tableName: "fileLigraryFilterDialog-m1",
-        path: this.current_prefix + "/file_obj/listAuthAttachPage",
+        path: () => {
+          let url = null;
+          if (this.fileType === 1) {
+            url = this.current_prefix + "/file_obj/listAuthAttachPage";
+          } else if (this.fileType === 2) {
+            url = this.current_prefix + "/file_obj/listAuthObjPage";
+          }
+          return url;
+        },
         param: () => {
           /* let parents = this.currentFileCategory &&
            this.currentFileCategory.id &&
@@ -252,6 +271,11 @@ export default {
               },
             },
           },
+          {
+            title: this.$t1("文件路径"),
+            field: "treePathName",
+            width: 250,
+          },
           {
             title: this.$t2("版本号", "components.fileLibrary.fileRev"),
             field: "rev",
@@ -275,13 +299,13 @@ export default {
             width: 250,
           },
           {
-            title: "状态",
+            title: this.$t1("状态"),
             field: "status",
             width: 150,
             slots: {
               default: ({ row, $rowIndex }) => {
                 if (!row.dirs) {
-                  return row.status == 1 ? "已归档" : "未归档";
+                  return row.status == 1 ? this.$t1("已归档") : this.$t1("未归档");
                 }
               },
             },
@@ -325,7 +349,7 @@ export default {
                         placement="top"
                         popper-class="tooltip-skin"
                       >
-                        <i class="el-icon-view" />
+                        <i class="el-icon-folder-opened" />
                       </el-tooltip>
                     </a>
                   </div>,