n20-common-lib 1.3.83 → 1.3.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.83",
+  "version": "1.3.85",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-suspend.scss

@@ -1,7 +1,6 @@
 .n20-suspend {
   display: flex;
   align-items: center;
-  width: 58px;
   height: 28px;
   cursor: pointer;
 

package/src/components/ApprovalButtons/index.vue

@@ -70,7 +70,7 @@
       v-drag
       :visible.sync="setCarboncopyV"
       :title="'设置抄送用户' | $lc"
-      width="900px"
+      width="960px"
       append-to-body
       top="7.5vh"
     >
@@ -80,7 +80,7 @@
       v-drag
       :visible.sync="setAddtaskV"
       :title="'设置加签用户' | $lc"
-      width="900px"
+      width="960px"
       append-to-body
       top="7.5vh"
     >

package/src/components/ApprovalButtons/setCarboncopyProp.vue

@@ -1,39 +1,59 @@
 <template>
-  <cl-page style="height: 75vh">
+  <cl-page style="height: 75vh; --table-w: 650px">
     <div slot="header" class="flex-box flex-v m-b">
-      <span class="m-r-ss">{{ '单位名称' | $lc }}</span>
+      <span class="m-r-ss">{{ '用户姓名' | $lc }}</span>
       <span>
-        <el-input v-model="searchObj.cltName" size="mini" />
+        <el-input v-model="searchObj.uname" size="mini" :placeholder="'请输入用户姓名' | $lc" />
       </span>
-      <span class="m-l m-r-ss">{{ '姓名' | $lc }}</span>
+      <span class="m-l m-r-ss">{{ '单位名称' | $lc }}</span>
       <span>
-        <el-input v-model="searchObj.uname" size="mini" />
+        <el-input v-model="searchObj.cltName" size="mini" :placeholder="'请选择单位' | $lc" />
       </span>
-      <span class="m-l m-r-ss">{{ '用户编号' | $lc }}</span>
-      <span>
-        <el-input v-model="searchObj.uno" size="mini" />
-      </span>
-      <el-button class="m-l-auto" plain size="mini" @click="searchFn">{{ '查询' | $lc }}</el-button>
+      <el-button class="m-l" plain size="mini" @click="resetFn">{{ '重置' | $lc }}</el-button>
+      <el-button type="primary" size="mini" @click="searchFn">{{ '查询' | $lc }}</el-button>
+    </div>
+    <div class="flex-box" style="height: 100%">
+      <el-table
+        ref="elTable"
+        :key="elTableKey"
+        :data="nodeTable"
+        row-key="uno"
+        border
+        height="100%"
+        style="width: var(--table-w); flex: none"
+        @select="sltChange"
+        @select-all="sltChange"
+      >
+        <el-table-column :reserve-selection="true" type="selection" width="46" header-align="center" align="center" />
+        <el-table-column prop="uname" :label="'用户姓名' | $lc" header-align="center" align="center" />
+        <el-table-column prop="cltName" :label="'单位名称' | $lc" header-align="center" align="center" />
+        <el-table-column prop="uno" :label="'登录账号/用户编号' | $lc" header-align="center" align="center" />
+      </el-table>
+      <div class="flex-column flex-c p-l p-r">
+        <i class="el-icon-d-arrow-left m-b"></i>
+        <i class="el-icon-d-arrow-right"></i>
+      </div>
+      <div class="flex-item bd-a">
+        <div class="text-c" style="height: 44px; line-height: 44px; background: var(--background-color-base)">
+          抄送对象
+        </div>
+        <div v-for="item in selectArr" :key="item.uno" class="flex-box p-a-s">
+          <span
+            v-title="item.uname + '/' + item.cltName"
+            :show-overflow-tooltip="true"
+            class="text-ellipsis"
+            style="width: 200px"
+            >{{ item.uname }}/{{ item.cltName }}</span
+          >
+          <el-link class="m-l-auto" :underline="false" icon="el-icon-close m-l-auto" @click="closeFn(item)" />
+        </div>
+      </div>
     </div>
-
-    <el-table
-      ref="elTable"
-      :key="elTableKey"
-      :data="nodeTable"
-      row-key="uno"
-      border
-      height="100%"
-      @select="sltChange"
-      @select-all="sltChange"
-    >
-      <el-table-column :reserve-selection="true" type="selection" width="46" header-align="center" align="center" />
-      <el-table-column prop="uno" :label="'编号' | $lc" header-align="center" align="center" />
-      <el-table-column prop="uname" :label="'姓名' | $lc" header-align="center" align="center" />
-      <el-table-column prop="cltName" :label="'单位' | $lc" header-align="center" align="center" />
-    </el-table>
     <template slot="footer">
-      <div class="flex-box flex-r m-t m-b">
+      <div class="flex-box m-t m-b" style="width: var(--table-w)">
+        <cl-statis :page-sum="nodeTable.length" :total-sun="pageObj.totalSize" />
         <cl-pagination
+          class="m-l-auto"
           :page-obj="pageObj"
           :page-key="{ no: 'pageNum', size: 'pageSize', total: 'totalSize' }"
           @change="getList"
@@ -50,10 +70,12 @@
 <script>
 import ClPage from '../PageLayout/page.vue'
 import ClPagination from '../Pagination/index.vue'
+import ClStatis from '../Statis/index.vue'
 export default {
   components: {
     ClPage,
-    ClPagination
+    ClPagination,
+    ClStatis
   },
   props: {
     carbonCopyList: {
@@ -104,9 +126,16 @@ export default {
       this.pageObj.pageNum = 1
       this.getList()
     },
+    resetFn() {
+      this.searchObj = {}
+    },
     sltChange(list) {
       this.selectArr = list || []
     },
+    closeFn(item) {
+      this.selectArr = this.selectArr.filter((d) => d.uno !== item.uno)
+      this.$refs.elTable.toggleRowSelection(item, false)
+    },
     confirmFn() {
       this.$emit('confirm', this.selectArr)
     }