cloud-web-corejs-haier 1.0.42 → 1.0.44

package/src/components/fileLibrary/index.vue

@@ -7,7 +7,10 @@
       <div class="tree-form" v-if="option.showCategoryFilterArea !== false">
         <el-input
           :placeholder="
-            $t2('请输入文件夹名称', 'components.fileLibrary.categoryPlaceholder')
+            $t2(
+              '请输入文件夹名称',
+              'components.fileLibrary.categoryPlaceholder'
+            )
           "
           v-model="filterText"
           class="txt"
@@ -59,15 +62,23 @@
         class="tree-list"
         icon-class="el-icon-arrow-down"
         :style="
-          option.showCategoryFilterArea === false ? 'height: calc(100vh - 113px)' : ''
+          option.showCategoryFilterArea === false
+            ? 'height: calc(100vh - 113px)'
+            : ''
         "
       >
-        <span class="el-tree-node__label" slot-scope="{ node }" v-if="!node.data.moreBtn">
+        <span
+          class="el-tree-node__label"
+          slot-scope="{ node }"
+          v-if="!node.data.moreBtn"
+        >
           <i class="ico-wenjian"></i>
           <span>{{ node.label }}</span>
         </span>
         <span v-else class="el-tree-node__label">
-          <el-button type="primary" plain class="button-sty">{{ node.label }}</el-button>
+          <el-button type="primary" plain class="button-sty">{{
+            node.label
+          }}</el-button>
         </span>
       </el-tree>
     </div>
@@ -79,7 +90,11 @@
     </label>
     <div class="main-right file-library fr" style="overflow: hidden">
       <div class="pop-annex-filter" v-if="popAnnexFilter">
-        <div class="item" v-for="(checkBillData, index) in checkBillDatas" :key="index">
+        <div
+          class="item"
+          v-for="(checkBillData, index) in checkBillDatas"
+          :key="index"
+        >
           <span>{{ getBillLabel(checkBillData) }}</span
           ><i class="el-icon-close" @click="deleteBillData(index)"></i>
         </div>
@@ -100,7 +115,11 @@
           }}
         </el-button>
         <div class="abox">
-          <div class="item" v-for="(checkBillData, index) in checkBillDatas" :key="index">
+          <div
+            class="item"
+            v-for="(checkBillData, index) in checkBillDatas"
+            :key="index"
+          >
             <span>{{ getBillLabel(checkBillData) }}</span
             ><i class="el-icon-close" @click="deleteBillData(index)"></i>
           </div>
@@ -210,7 +229,9 @@
           {{ $t1("搜索") }}
         </el-button>
 
-        <template v-for="(fileButton, customToobarButtonIndex) in customToobarButtons">
+        <template
+          v-for="(fileButton, customToobarButtonIndex) in customToobarButtons"
+        >
           <template
             v-if="
               fileButton.dirs === null ||
@@ -276,7 +297,10 @@
               <template v-if="currentFileCategory && currentFileCategory.id">
                 <el-input
                   :placeholder="
-                    $t2('请输入文件名', 'components.fileLibrary.filePlaceholder')
+                    $t2(
+                      '请输入文件名',
+                      'components.fileLibrary.filePlaceholder'
+                    )
                   "
                   v-model="formData.fileName"
                   clearable
@@ -337,13 +361,17 @@
                     class="item"
                     :class="checkList.includes(attachment.id) ? 'on' : ''"
                   >
-                    <el-checkbox :label="attachment.id"><span></span></el-checkbox>
+                    <el-checkbox :label="attachment.id"
+                      ><span></span
+                    ></el-checkbox>
                     <div class="oper">
                       <el-tooltip
                         effect="dark"
                         content="详情"
                         placement="top"
-                        v-if="!attachment.dirs && isEdit && fileObjAuth.editAuth"
+                        v-if="
+                          !attachment.dirs && isEdit && fileObjAuth.editAuth
+                        "
                         ><i
                           class="el-tooltip iconfont icon-shuxing ico"
                           @click="openPropertiesDialog(attachment)"
@@ -383,7 +411,9 @@
                             ><i class="el-icon-share"></i>分享
                           </el-dropdown-item>
                           <el-dropdown-item
-                            @click.native="replaceFile(attachment, index, page.records)"
+                            @click.native="
+                              replaceFile(attachment, index, page.records)
+                            "
                             v-if="
                               !attachment.dirs &&
                               isEdit &&
@@ -398,7 +428,6 @@
                             v-if="
                               !attachment.dirs &&
                               isEdit &&
-                              attachment.status != 1 &&
                               fileObjAuth.historyAuth
                             "
                           >
@@ -417,12 +446,18 @@
                           </el-dropdown-item>
                           <el-dropdown-item
                             @click.native="deleteCategory(attachment)"
-                            v-if="attachment.dirs && isEdit && fileObjAuth.deleteDirAuth"
+                            v-if="
+                              attachment.dirs &&
+                              isEdit &&
+                              fileObjAuth.deleteDirAuth
+                            "
                           >
                             <i class="el-icon-delete"></i>删除
                           </el-dropdown-item>
                           <template
-                            v-for="(fileButton, fileButtonIndex) in customFileButtons"
+                            v-for="(
+                              fileButton, fileButtonIndex
+                            ) in customFileButtons"
                           >
                             <template
                               v-if="
@@ -432,15 +467,24 @@
                               "
                             >
                               <template
-                                v-if="customFileButtonVisable(fileButton, attachment)"
+                                v-if="
+                                  customFileButtonVisable(
+                                    fileButton,
+                                    attachment
+                                  )
+                                "
                               >
                                 <el-dropdown-item
                                   @click.native="
-                                    customFileButtonEvent(fileButton, attachment)
+                                    customFileButtonEvent(
+                                      fileButton,
+                                      attachment
+                                    )
                                   "
                                   :key="fileButtonIndex"
                                 >
-                                  <i :class="fileButton.icon"></i>{{ fileButton.label }}
+                                  <i :class="fileButton.icon"></i
+                                  >{{ fileButton.label }}
                                 </el-dropdown-item>
                               </template>
                             </template>
@@ -490,13 +534,17 @@
                         <div class="tb-left"></div>
                         <div class="tb-mid">
                           <div class="txt">
-                            <span class="name">{{ getFileName(attachment) }}</span
+                            <span class="name">{{
+                              getFileName(attachment)
+                            }}</span
                             ><span v-if="attachment.extension"
                               >.{{ attachment.extension }}</span
                             >
                           </div>
                         </div>
-                        <div class="format">... .{{ attachment.extension }}</div>
+                        <div class="format">
+                          ... .{{ attachment.extension }}
+                        </div>
                       </div>
                     </el-tooltip>
                   </li>
@@ -561,7 +609,9 @@
               >
                 <template #right>
                   <span>
-                    <span>{{ $t2("当前记录", "components.table.pageInfo") }}</span>
+                    <span>{{
+                      $t2("当前记录", "components.table.pageInfo")
+                    }}</span>
                     <span class="f-red"> {{ page.records.length }} </span>
                     <span>/</span>
                     <span class="f-red"> {{ page.total }}</span>
@@ -622,7 +672,9 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && row.status != 1 && fileObjAuth.replaceAuth === 1"
+                  v-if="
+                    isEdit && row.status != 1 && fileObjAuth.replaceAuth === 1
+                  "
                   @click="replaceFile(row, rowIndex, items)"
                 >
                   <el-tooltip
@@ -638,7 +690,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && row.status != 1 && fileObjAuth.historyAuth === 1"
+                  v-if="isEdit && fileObjAuth.historyAuth === 1"
                   @click="openFileHistoryDialog(row)"
                 >
                   <el-tooltip
@@ -654,7 +706,9 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && row.status != 1 && fileObjAuth.deleteAuth === 1"
+                  v-if="
+                    isEdit && row.status != 1 && fileObjAuth.deleteAuth === 1
+                  "
                   @click="deleteAttach(row)"
                 >
                   <el-tooltip
@@ -688,7 +742,9 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && isCategoryEdit && fileObjAuth.deleteDirAuth === 1"
+                  v-if="
+                    isEdit && isCategoryEdit && fileObjAuth.deleteDirAuth === 1
+                  "
                   @click="deleteAttach(row)"
                 >
                   <el-tooltip
@@ -758,26 +814,42 @@
             class="adSearchForm"
           >
             <el-form-item
-              :label="$t2('文件夹路径', 'components.fileLibrary.fileCategoryPath')"
+              :label="
+                $t2('文件夹路径', 'components.fileLibrary.fileCategoryPath')
+              "
             >
               <el-breadcrumb separator-class="el-icon-arrow-right">
-                <el-breadcrumb-item v-for="(treeNode, index) in treeNodeArr" :key="index"
+                <el-breadcrumb-item
+                  v-for="(treeNode, index) in treeNodeArr"
+                  :key="index"
                   >{{ treeNode.label }}
                 </el-breadcrumb-item>
               </el-breadcrumb>
             </el-form-item>
             <el-form-item
-              :label="$t2('文件夹编码', 'components.fileLibrary.fileCategorySn')"
+              :label="
+                $t2('文件夹编码', 'components.fileLibrary.fileCategorySn')
+              "
             >
               <span>{{ editCategory.fileSn }}</span>
             </el-form-item>
             <el-form-item
-              :label="$t2('文件夹名称', 'components.fileLibrary.fileCategoryName')"
+              :label="
+                $t2('文件夹名称', 'components.fileLibrary.fileCategoryName')
+              "
             >
-              <el-input v-model="editCategory.fileName" clearable class="all-width" />
+              <el-input
+                v-model="editCategory.fileName"
+                clearable
+                class="all-width"
+              />
             </el-form-item>
             <el-form-item :label="$t1('关联编码')">
-              <el-input v-model="editCategory.relationCode" clearable class="all-width" />
+              <el-input
+                v-model="editCategory.relationCode"
+                clearable
+                class="all-width"
+              />
             </el-form-item>
           </el-form>
         </div>
@@ -791,7 +863,11 @@
             <i class="el-icon-close el-icon"></i>
             {{ $t2("取 消", "system.button.cancel2") }}
           </el-button>
-          <el-button type="primary" @click="confirmEditCategoryDialog" class="button-sty">
+          <el-button
+            type="primary"
+            @click="confirmEditCategoryDialog"
+            class="button-sty"
+          >
             <i class="el-icon-check el-icon"></i>
             {{ $t2("确 定", "system.button.confirm2") }}
           </el-button>
@@ -889,7 +965,9 @@
                 size="small"
                 clearable
                 value-format="yyyy-MM-dd"
-                :picker-options="$baseStartPickerOptions(advancedFormData.endTime)"
+                :picker-options="
+                  $baseStartPickerOptions(advancedFormData.endTime)
+                "
               ></el-date-picker>
               <span>-</span>
               <el-date-picker
@@ -899,7 +977,9 @@
                 size="small"
                 clearable
                 value-format="yyyy-MM-dd"
-                :picker-options="$baseEndPickerOptions(advancedFormData.startTime)"
+                :picker-options="
+                  $baseEndPickerOptions(advancedFormData.startTime)
+                "
               ></el-date-picker>
             </template>
           </vxe-form-item>

package/src/components/fileLibrary/propertiesDialog.vue

@@ -90,6 +90,12 @@
                       <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>

package/src/components/hiprint/view/design/index.vue

@@ -1,61 +1,130 @@
 <template>
   <el-card>
-    <div style="display: flex;flex-direction: column" class="print-oper">
+    <div style="display: flex; flex-direction: column" class="print-oper">
       <div>
         <el-button-group>
-          <template v-for="(value,type) in paperTypes">
-            <el-button size="mini" :type="curPaperType === type ? 'primary' : ' '" @click="setPaper(type,value)"
-                       :key="type">
+          <template v-for="(value, type) in paperTypes">
+            <el-button
+              size="mini"
+              :type="curPaperType === type ? 'primary' : ' '"
+              @click="setPaper(type, value)"
+              :key="type"
+            >
               {{ type }}
             </el-button>
           </template>
-          <el-popover v-model="paperPopVisible" title="设置纸张宽高(mm)" trigger="click" width="256">
-            <base-input-number v-model="paperWidth" style=" width: 100px !important; text-align: center"
-                               placeholder="宽(mm)"/>
-            <el-input style=" width: 30px !important; border-left: 0; pointer-events: none; backgroundColor: #fff"
-                      placeholder="~" disabled/>
-            <base-input-number v-model="paperHeight" style="width: 100px !important; text-align: center; border-left: 0"
-                               placeholder="高(mm)"/>
-            <el-button type="primary" class="button-sty" style="width: 100%;margin-top:8px" @click="otherPaper">确定
+          <el-popover
+            v-model="paperPopVisible"
+            title="设置纸张宽高(mm)"
+            trigger="click"
+            width="256"
+          >
+            <base-input-number
+              v-model="paperWidth"
+              style="width: 100px !important; text-align: center"
+              placeholder="宽(mm)"
+            />
+            <el-input
+              style="
+                width: 30px !important;
+                border-left: 0;
+                pointer-events: none;
+                backgroundcolor: #fff;
+              "
+              placeholder="~"
+              disabled
+            />
+            <base-input-number
+              v-model="paperHeight"
+              style="width: 100px !important; text-align: center; border-left: 0"
+              placeholder="高(mm)"
+            />
+            <el-button
+              type="primary"
+              class="button-sty"
+              style="width: 100%; margin-top: 8px"
+              @click="otherPaper"
+              >确定
             </el-button>
-            <el-button size="mini" :type="'other'==curPaperType?'primary':''" slot="reference" class="button-sty">
+            <el-button
+              size="mini"
+              :type="'other' === curPaperType ? 'primary' : ''"
+              slot="reference"
+              class="button-sty"
+            >
               自定义纸张
             </el-button>
           </el-popover>
         </el-button-group>
-        <el-button class="button-zoom" icon="el-icon-zoom-out" @click="changeScale(false)"></el-button>
+        <el-button
+          class="button-zoom"
+          icon="el-icon-zoom-out"
+          @click="changeScale(false)"
+        ></el-button>
         <el-input-number
           :value="scaleValue"
           :min="scaleMin"
           :max="scaleMax"
           :step="0.1"
           disabled
-          style="width: 70px;"
+          style="width: 70px"
           class="noButton"
-          :formatter="value => `${(value * 100).toFixed(0)}%`"
-          :parser="value => value.replace('%', '')"
+          :formatter="(value) => `${(value * 100).toFixed(0)}%`"
+          :parser="(value) => value.replace('%', '')"
         />
-        <el-button class="button-zoom" icon="el-icon-zoom-in" @click="changeScale(true)"></el-button>
-        <el-button type="primary" class="button-sty" icon="el-icon-refresh-right" @click="rotatePaper()" plain>旋转
+        <el-button
+          class="button-zoom"
+          icon="el-icon-zoom-in"
+          @click="changeScale(true)"
+        ></el-button>
+        <el-button
+          type="primary"
+          class="button-sty"
+          icon="el-icon-refresh-right"
+          @click="rotatePaper()"
+          plain
+          >旋转
         </el-button>
-        <el-button type="warning" class="button-sty" icon="el-icon-view" @click="preView">预览</el-button>
-        <el-popover
-          width="180"
-          v-model="visible"
-          @confirm="clearPaper"
+        <el-button type="warning" class="button-sty" icon="el-icon-view" @click="preView"
+          >预览</el-button
         >
+        <el-popover width="180" v-model="visible" @confirm="clearPaper">
           <p><i class="el-icon-warning-outline f-red"></i> 是否确认清空?？</p>
           <div style="text-align: right; margin: 0">
             <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-            <el-button type="primary" size="mini" @click="clearPaper();visible = false">确定清空</el-button>
+            <el-button
+              type="primary"
+              size="mini"
+              @click="
+                clearPaper();
+                visible = false;
+              "
+              >确定清空</el-button
+            >
           </div>
-          <el-button type="danger" class="button-sty" icon="el-icon-close" slot="reference" style="margin:0 10px;">
+          <el-button
+            type="danger"
+            class="button-sty"
+            icon="el-icon-close"
+            slot="reference"
+            style="margin: 0 10px"
+          >
             清空
           </el-button>
         </el-popover>
-        <el-button type="primary" class="button-sty" icon="el-icon-download" @click="importDefaultTemplate1">导入默认模板1
+        <el-button
+          type="primary"
+          class="button-sty"
+          icon="el-icon-download"
+          @click="importDefaultTemplate1"
+          >导入默认模板1
         </el-button>
-        <el-button type="primary" class="button-sty" icon="el-icon-download" @click="importDefaultTemplate2">导入默认模板2
+        <el-button
+          type="primary"
+          class="button-sty"
+          icon="el-icon-download"
+          @click="importDefaultTemplate2"
+          >导入默认模板2
         </el-button>
         <div class="hiprint-printPagination"></div>
         <!--		<el-radio-group size="mini">
@@ -151,7 +220,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.text" style>
-                      <span class="glyphicon glyphicon-text-width" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-text-width"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">文本</p>
                     </a>
                   </div>
@@ -167,7 +239,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.longText">
-                      <span class="glyphicon glyphicon-subscript" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-subscript"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">长文</p>
                     </a>
                   </div>
@@ -199,7 +274,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.customText" style>
-                      <span class="glyphicon glyphicon-text-width" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-text-width"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">自定义</p>
                     </a>
                   </div>
@@ -208,7 +286,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.barcode" style>
-                      <span class="glyphicon iconfont icon-bar-code-full" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon iconfont icon-bar-code-full"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">条形码</p>
                     </a>
                   </div>
@@ -216,19 +297,24 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.qrcode" style>
-                      <span class="glyphicon iconfont icon-erweima" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon iconfont icon-erweima"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">二维码</p>
                     </a>
                   </div>
                 </el-col>
-
               </el-row>
               <el-row class="drag_item_title">辅助</el-row>
               <el-row>
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.hline" style>
-                      <span class="glyphicon glyphicon-resize-horizontal" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-resize-horizontal"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">横线</p>
                     </a>
                   </div>
@@ -236,7 +322,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.vline" style>
-                      <span class="glyphicon glyphicon-resize-vertical" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-resize-vertical"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">竖线</p>
                     </a>
                   </div>
@@ -244,7 +333,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.rect">
-                      <span class="glyphicon glyphicon-unchecked" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-unchecked"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">矩形</p>
                     </a>
                   </div>
@@ -276,19 +368,19 @@
       </el-col>
     </el-row>
     <!-- 预览 -->
-    <print-preview ref="preView"/>
+    <print-preview ref="preView" />
   </el-card>
 </template>
 
 <script>
-import mixins from './mixins.js';
+import mixins from "./mixins.js";
 export default {
   name: "printDesign",
-  mixins: [mixins]
-}
+  mixins: [mixins],
+};
 </script>
 <style src="../../css/bootstrap.min.css" scoped></style>
-<style lang="less" scoped>
+<style lang="scss" scoped>
 // 拖拽
 .drag_item_box {
   height: 100%;
@@ -305,29 +397,29 @@ export default {
 }
 
 // 默认图片
-/deep/ .hiprint-printElement-image-content {
+::v-deep .hiprint-printElement-image-content {
   img {
     content: url("~@/assets/logo.png");
   }
 }
 
 // 辅助线样式
-/deep/ .toplineOfPosition {
+::v-deep .toplineOfPosition {
   border: 0;
   border-top: 1px dashed purple;
 }
 
-/deep/ .bottomlineOfPosition {
+::v-deep .bottomlineOfPosition {
   border: 0;
   border-top: 1px dashed purple;
 }
 
-/deep/ .leftlineOfPosition {
+::v-deep .leftlineOfPosition {
   border: 0;
   border-left: 1px dashed purple;
 }
 
-/deep/ .rightlineOfPosition {
+::v-deep .rightlineOfPosition {
   border: 0;
   border-left: 1px dashed purple;
 }