n20-common-lib 2.4.5 → 2.4.7

package/nstc-g6/components/NstcExcelImportN/NstcExcelImportN.vue

@@ -1,10 +1,6 @@
 <template>
   <div>
-    <el-dropdown
-      trigger="click"
-      placement="bottom-start"
-      @command="handleCommand"
-    >
+    <el-dropdown trigger="click" placement="bottom-start" @command="handleCommand">
       <el-button type="primary" class="drop-btn-item">
         导入<i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
@@ -34,15 +30,11 @@
           导入统计
           <span>共计导入 {{ validateResult.totalNum }}条, </span>
           <span
-            >其中有效数据<span class="effect-data">
-              {{ validateResult.successNum }} </span
-            >条,
+            >其中有效数据<span class="effect-data"> {{ validateResult.successNum }} </span>条,
           </span>
           <span
             >无效数据
-            <span class="nstc-import-error-num">{{
-              validateResult.errorList.length
-            }}</span>
+            <span class="nstc-import-error-num">{{ validateResult.errorList.length }}</span>
             条。</span
           >
         </div>
@@ -64,14 +56,9 @@
           </el-table-column>
         </el-table>
       </div>
-      <div v-show="hasErrorFlag" class="end-tips">
-        上述数据输入有误，请修改导入文件中相关信息！
-      </div>
+      <div v-show="hasErrorFlag" class="end-tips">上述数据输入有误，请修改导入文件中相关信息！</div>
       <div class="footer">
-        <el-button
-          type="primary"
-          :disabled="excelData.tableData.length === 0 || confirmDisabledFlag"
-          @click="cancel"
+        <el-button type="primary" :disabled="excelData.tableData.length === 0 || confirmDisabledFlag" @click="cancel"
           >确定
         </el-button>
       </div>
@@ -176,10 +163,7 @@ export default {
   },
   computed: {
     hasErrorFlag() {
-      return (
-        this.validateResult.errorList &&
-        this.validateResult.errorList.length > 0
-      )
+      return this.validateResult.errorList && this.validateResult.errorList.length > 0
     }
   },
   watch: {
@@ -230,8 +214,7 @@ export default {
         console.log(this.errorListTemp, this.columnsListTemp)
 
         this.successFlag =
-          this.validateResult.successNum !== 0 &&
-          this.validateResult.successNum === this.validateResult.totalNum
+          this.validateResult.successNum !== 0 && this.validateResult.successNum === this.validateResult.totalNum
 
         if (this.footerHandlers.confirm) {
           this.footerHandlers.confirm.disabled = !this.successFlag
@@ -763,12 +746,8 @@ export default {
   }
 
   .el-radio__inner:hover,
-  .el-input-number__decrease:hover:not(.is-disabled)
-    ~ .el-input
-    .el-input__inner:not(.is-disabled),
-  .el-input-number__increase:hover:not(.is-disabled)
-    ~ .el-input
-    .el-input__inner:not(.is-disabled),
+  .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled),
+  .el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled),
   .el-cascader .el-input.is-focus .el-input__inner {
     border-color: #007aff;
   }
@@ -1012,9 +991,7 @@ export default {
   background-color: rgba(0, 122, 255, 0.1);
 }
 
-.el-select-dropdown.is-multiple
-  .el-scrollbar__view
-  .el-select-dropdown__item.selected.hover {
+.el-select-dropdown.is-multiple .el-scrollbar__view .el-select-dropdown__item.selected.hover {
   background-color: rgba(0, 122, 255, 0.1);
 }
 

package/nstc-g6/components/NstcExpandCollapse/NstcExpandCollapse.vue

@@ -6,9 +6,9 @@
 <template>
   <div :class="['expand-collapse', { 'is-collapse': _isCollapse, 'content-is-table': contentIsTable }]">
     <div
-        v-if="title || $slots.title"
-        :class="isCanCollapse ? 'expand-collapse-header' : 'expand-collapse-header-collapse'"
-        @click="handleToggle"
+      v-if="title || $slots.title"
+      :class="isCanCollapse ? 'expand-collapse-header' : 'expand-collapse-header-collapse'"
+      @click="handleToggle"
     >
       <i v-if="isCanCollapse" class="el-icon-caret-top expand-collapse-icon" />
       <slot v-if="$slots.title" name="title" />
@@ -17,13 +17,13 @@
 
     <el-collapse-transition>
       <div
-          v-show="!_isCollapse"
-          :class="{ 'expand-collapse-content': true, 'drag-in': dragIn }"
-          @dragenter="dragenter"
-          @dragover="dragover"
-          @dragleave="dragleave"
-          @drop="drop"
-          @dragover.prevent
+        v-show="!_isCollapse"
+        :class="{ 'expand-collapse-content': true, 'drag-in': dragIn }"
+        @dragenter="dragenter"
+        @dragover="dragover"
+        @dragleave="dragleave"
+        @drop="drop"
+        @dragover.prevent
       >
         <div class="expand-collapse-content-box">
           <slot />
@@ -31,11 +31,7 @@
       </div>
     </el-collapse-transition>
 
-    <div
-        v-if="!title && !$slots.title && expandCollapseFlag"
-        class="expand-collapse-footer"
-        @click="handleToggle"
-    >
+    <div v-if="!title && !$slots.title && expandCollapseFlag" class="expand-collapse-footer" @click="handleToggle">
       <i class="el-icon-caret-top expand-collapse-icon" />
     </div>
   </div>
@@ -126,5 +122,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "index";
+@import 'index';
 </style>

package/nstc-g6/components/NstcFileUpload/NstcFileUpload.vue

@@ -45,20 +45,10 @@
           <el-table-column label="附件类型" align="left" min-width="180">
             <template slot-scope="scope">
               <!-- !textFlag(scope.row.uuid,scope.row.filePath) -->
-              <el-select
-                v-if="!textFlag(scope.row.uuid, scope.row.filePath) && !views"
-                v-model="scope.row.fileType"
-              >
-                <el-option
-                  v-for="(item, index) in fileTypeList"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-if="!textFlag(scope.row.uuid, scope.row.filePath) && !views" v-model="scope.row.fileType">
+                <el-option v-for="(item, index) in fileTypeList" :key="index" :label="item.label" :value="item.value" />
               </el-select>
-              <span v-else>{{
-                getFileTypeLabel(scope.row.fileType) || '--'
-              }}</span>
+              <span v-else>{{ getFileTypeLabel(scope.row.fileType) || '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="附件名称" align="left" min-width="180">
@@ -118,16 +108,9 @@
             </template>
             <el-input />
           </el-table-column>
-          <el-table-column
-            label="上传时间"
-            prop="time"
-            align="left"
-            width="220px"
-          >
+          <el-table-column label="上传时间" prop="time" align="left" width="220px">
             <template slot-scope="scope">
-              <span>{{
-                (scope.row.time || scope.row.createTime) | parseTimeFormat
-              }}</span>
+              <span>{{ (scope.row.time || scope.row.createTime) | parseTimeFormat }}</span>
             </template>
           </el-table-column>
           <el-table-column label="上传人" prop="user" align="left">
@@ -135,27 +118,17 @@
               <span>{{ scope.row.user || scope.row.creator }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            v-if="pattern !== 'text'"
-            label="上传进度"
-            align="left"
-            width="300px"
-          >
+          <el-table-column v-if="pattern !== 'text'" label="上传进度" align="left" width="300px">
             <template slot-scope="scope">
               <div class="nstc-el-progress-box">
                 <el-progress
                   v-show="showProgress"
                   :percentage="
-                    (scope.row.uuid || scope.row.filePath) &&
-                    scope.row.status !== 'exception'
+                    (scope.row.uuid || scope.row.filePath) && scope.row.status !== 'exception'
                       ? 100
                       : scope.row.percentage
                   "
-                  :status="
-                    scope.row.uuid || scope.row.filePath
-                      ? 'success'
-                      : scope.row.status
-                  "
+                  :status="scope.row.uuid || scope.row.filePath ? 'success' : scope.row.status"
                   :width="100"
                 />
               </div>
@@ -172,16 +145,9 @@
               <div class="nstc-file-upload-opt">
                 <!-- v-if="false" -->
                 <!--  -->
+                <img v-if="showViews" :src="lookDiabled" alt="" @click="lookFile(scope.$index)" />
                 <img
-                  v-if="showViews"
-                  :src="lookDiabled"
-                  alt=""
-                  @click="lookFile(scope.$index)"
-                />
-                <img
-                  v-if="
-                    (scope.row.uuid || scope.row.filePath) && pattern === 'text'
-                  "
+                  v-if="(scope.row.uuid || scope.row.filePath) && pattern === 'text'"
                   :src="downloadSvg"
                   alt=""
                   @click="downLoadFile(scope.row)"
@@ -198,12 +164,7 @@
         </el-table>
       </el-form>
     </div>
-    <DialogCustom
-      v-model="dialogShowFlag"
-      :show-footer="false"
-      :title="dialogTitle"
-      @confirm="handleConfirm"
-    >
+    <DialogCustom v-model="dialogShowFlag" :show-footer="false" :title="dialogTitle" @confirm="handleConfirm">
       <span>查看文件</span>
     </DialogCustom>
   </div>
@@ -458,9 +419,7 @@ export default {
           let blob = new Blob([res.data], {
             type: 'application/octet-stream;charset=UTF-8'
           })
-          let fileName = decodeURI(
-            res.headers['content-disposition'].split(';')[1].split('=')[1]
-          )
+          let fileName = decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1])
           if (window.navigator.msSaveBlob) {
             // ie
             window.navigator.msSaveOrOpenBlob(blob, fileName)
@@ -553,9 +512,7 @@ export default {
             let blob = new Blob([res.data], {
               type: 'application/octet-stream;charset=UTF-8'
             })
-            let fileName = decodeURI(
-              res.headers['content-disposition'].split(';')[1].split('=')[1]
-            )
+            let fileName = decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1])
             if (window.navigator.msSaveBlob) {
               // ie
               window.navigator.msSaveOrOpenBlob(blob, fileName)
@@ -675,20 +632,13 @@ export default {
           // 上传成功
           // that.tableData[this.currentUploadIndex].percentage = 100
           console.log('上传文件1111', res)
-          this.tableData[this.currentUploadIndex].time = parseTime(
-            res[0][`time`],
-            '{y}-{m}-{d} {h}:{i}:{s}'
-          )
+          this.tableData[this.currentUploadIndex].time = parseTime(res[0][`time`], '{y}-{m}-{d} {h}:{i}:{s}')
           this.tableData[this.currentUploadIndex].uuid = res[0][`uuid`]
           this.tableData[this.currentUploadIndex].status = 'success'
           this.tableData[this.currentUploadIndex].user = res[0][`user`]
           this.tableData[this.currentUploadIndex].creator = res[0][`creator`]
-          res[0][`createTime`] = parseTime(
-            res[0][`createTime`],
-            '{y}-{m}-{d} {h}:{i}:{s}'
-          )
-          this.tableData[this.currentUploadIndex].createTime =
-            res[0][`createTime`]
+          res[0][`createTime`] = parseTime(res[0][`createTime`], '{y}-{m}-{d} {h}:{i}:{s}')
+          this.tableData[this.currentUploadIndex].createTime = res[0][`createTime`]
           this.$emit('upload_over', {})
         })
         .catch(() => {
@@ -807,9 +757,7 @@ export default {
         // 没有上传文件 并且选择了文件
         if (!item.uuid && item.fileObj) {
           uploadFileArr.push({
-            ref_index: this.tableData.findIndex(
-              (objitem) => objitem.id === item.id
-            ),
+            ref_index: this.tableData.findIndex((objitem) => objitem.id === item.id),
             data: item
           })
         }
@@ -830,9 +778,7 @@ export default {
         // 启动上传
         uploadedLength++
         this.currentUploadIndex = fileArr[0].ref_index
-        this.$refs[
-          `nstc_g6_common_upload_index_${this.currentUploadIndex}`
-        ].submit()
+        this.$refs[`nstc_g6_common_upload_index_${this.currentUploadIndex}`].submit()
 
         // 监听上传完毕
         this.$on('upload_over', () => {
@@ -841,9 +787,7 @@ export default {
           } else {
             uploadedLength++
             this.currentUploadIndex = fileArr[uploadedLength - 1].ref_index
-            this.$refs[
-              `nstc_g6_common_upload_index_${this.currentUploadIndex}`
-            ].submit()
+            this.$refs[`nstc_g6_common_upload_index_${this.currentUploadIndex}`].submit()
           }
         })
       })

package/nstc-g6/components/NstcForm/A_DEMO/component/originalForm.vue

@@ -1,10 +1,6 @@
 <template>
   <div>
-    <el-form
-        ref="registerForm"
-        :model="registerForm"
-        class="nstc-original-element-form"
-    >
+    <el-form ref="registerForm" :model="registerForm" class="nstc-original-element-form">
       <a id="account_1" />
       <nstc-expand-collapse v-model="isCollapseArr[0]">
         <template v-slot:title>
@@ -13,11 +9,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="开户日期" prop="openAccountDate">
-              <el-date-picker
-                  v-model="registerForm.openAccountDate"
-                  type="date"
-                  placeholder="请选择"
-              />
+              <el-date-picker v-model="registerForm.openAccountDate" type="date" placeholder="请选择" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -31,10 +23,10 @@
             <el-form-item label="币种" prop="currencyNo">
               <el-select v-model="registerForm.currencyNo" filterable>
                 <el-option
-                    v-for="(item,index) in currencyDropDown"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
+                  v-for="(item, index) in currencyDropDown"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -112,10 +104,10 @@
             <el-form-item label="银行账户性质" prop="ctId">
               <el-select v-model="registerForm.ctId" filterable>
                 <el-option
-                    v-for="(item,index) in AccountTypeToBP"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
+                  v-for="(item, index) in AccountTypeToBP"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -124,10 +116,10 @@
             <el-form-item label="现金管理类型" prop="cashManageType">
               <el-select v-model="registerForm.cashManageType" filterable>
                 <el-option
-                    v-for="(item,index) in AccountNatureToBP"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
+                  v-for="(item, index) in AccountNatureToBP"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -141,11 +133,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="账户有效期" prop="validDate">
-              <el-date-picker
-                  v-model="registerForm.validDate"
-                  type="daterange"
-                  placeholder="请选择"
-              />
+              <el-date-picker v-model="registerForm.validDate" type="daterange" placeholder="请选择" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -173,10 +161,10 @@
             <el-form-item label="账户性质">
               <el-select v-model="registerForm.accountType" filterable>
                 <el-option
-                    v-for="(item,index) in accountTypeDb"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
+                  v-for="(item, index) in accountTypeDb"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -185,10 +173,10 @@
             <el-form-item label="账户类别">
               <el-select v-model="registerForm.natureId" filterable>
                 <el-option
-                    v-for="(item,index) in accountNatureDb"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
+                  v-for="(item, index) in accountNatureDb"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -199,10 +187,10 @@
             <el-form-item label="区域">
               <el-select v-model="registerForm.areaId" filterable>
                 <el-option
-                    v-for="(item,index) in accountAreaDb"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
+                  v-for="(item, index) in accountAreaDb"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -221,23 +209,22 @@
             <el-form-item label="账户用途">
               <el-select v-model="registerForm.usageId" filterable>
                 <el-option
-                    v-for="(item,index) in accountUsageDb"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
+                  v-for="(item, index) in accountUsageDb"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
       </nstc-expand-collapse>
-
     </el-form>
 
     <!-- 表单提交 -->
     <div class="account-submit-box">
-      <el-button type="primary" class=" nstc-g6-common-btn-1 nstc-g6-common-btn-size-b">提交</el-button>
-      <el-button class=" nstc-g6-common-btn-1 nstc-g6-common-btn-size-b">保存</el-button>
+      <el-button type="primary" class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b">提交</el-button>
+      <el-button class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b">保存</el-button>
     </div>
   </div>
 </template>
@@ -245,7 +232,7 @@
 <script>
 import NstcExpandCollapse from '../../../NstcExpandCollapse/NstcExpandCollapse'
 export default {
-  name: "originalForm",
+  name: 'originalForm',
   components: {
     NstcExpandCollapse
   },
@@ -276,6 +263,4 @@ export default {
 }
 </script>
 
-<style>
-
-</style>
+<style></style>