n20-common-lib 2.9.13 → 2.9.14

package/src/components/ApprovalButtons/selectSpr.vue

@@ -0,0 +1,128 @@
+<template>
+  <cl-page style="height: 75vh; --table-w: 650px">
+    <div class="flex-box" style="height: 100%">
+      <el-table
+        ref="elTable"
+        :data="selectSprList.actNextNodeAssigneeVos"
+        row-key="nodeId"
+        border
+        height="100%"
+        style="width: 30%; flex: none"
+        @select="sltChange"
+        @select-all="sltChange"
+      >
+        <el-table-column header-align="center" align="left" :label="'审批节点' | $lc">
+          <template slot-scope="scope">
+            <el-radio v-model="nextEgwOutgoingNodeId" :label="scope.row.nodeId" @change="sltChange(scope.row)">{{
+              scope.row.nodeName
+            }}</el-radio>
+          </template>
+        </el-table-column>
+      </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>
+      <el-table
+        ref="personTable"
+        :data="nodeTable"
+        row-key="uno"
+        border
+        height="100%"
+        style="width: var(--table-w); flex: none"
+        @select="personChange"
+        @select-all="personChange"
+      >
+        <el-table-column
+          :selectable="handleSelectable"
+          :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="deptName" :label="'审批人所属部门' | $lc" header-align="center" align="center" />
+      </el-table>
+    </div>
+    <template slot="footer">
+      <div class="flex-box m-t m-b" style="margin-left: calc(30% + 50px)">
+        <cl-statis-item type="已选合计" :list="[{ label: '笔数', value: personList.length }]" show-w />
+      </div>
+      <div class="text-c">
+        <el-button type="primary" @click="confirmFn">{{ '确定' | $lc }}</el-button>
+        <el-button @click="$emit('close')">{{ '取消' | $lc }}</el-button>
+      </div>
+    </template>
+  </cl-page>
+</template>
+
+<script>
+import { $lc } from '../../utils/i18n/index'
+import ClPage from '../PageLayout/page.vue'
+import ClStatisItem from '../Statis/statisItem.vue'
+export default {
+  components: {
+    ClPage,
+    ClStatisItem
+  },
+  props: {
+    selectSprList: {
+      type: Array,
+      default: () => {
+        return {
+          actNextNodeAssigneeVos: []
+        }
+      }
+    },
+    type: {
+      type: String,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      nextEgwOutgoingNodeId: '',
+      nodeTable: [],
+      selectCheck: true,
+      personList: []
+    }
+  },
+  mounted() {
+    this.$refs.elTable.clearSelection()
+    this.carbonCopyList.forEach((item) => {
+      this.$refs.elTable.toggleRowSelection(item, true)
+    })
+  },
+  methods: {
+    handleSelectable(row) {
+      // 返回 false 禁止选择该行
+      return this.selectCheck
+    },
+    sltChange(row) {
+      this.nodeTable = row.actAssigneeVoList
+      this.$refs.personTable.clearSelection()
+      this.selectCheck = this.selectSprList?.showNextNodeAssignee || false
+    },
+    personChange(list) {
+      this.personList = list
+    },
+    closeFn(item) {
+      this.selectSprList = {
+        actNextNodeAssigneeVos: []
+      }
+    },
+    confirmFn() {
+      this.$emit('confirm', {
+        nextEgwOutgoingNodeId: this.selectSprList?.showNextEgwOutgoingNodeName ? this.nextEgwOutgoingNodeId : undefined,
+        nextNodeApproveUnos: this.selectSprList?.showNextNodeAssignee
+          ? this.personList.map((item) => item.uno)
+          : undefined
+      })
+    }
+  }
+}
+</script>
+
+<style></style>

package/src/components/ApprovalButtons/setCarboncopyProp.vue

@@ -127,7 +127,7 @@ export default {
       }
       axios
         .post(
-          '/bems/activiti/online/chdUserInfo',
+          '/bems/prod_1.0/user/wfMasterUser/queryPageNoAuth',
           {
             data: this.searchObj,
             ...this.pageObj

package/src/components/ApprovalButtons/setRejectToProp.vue

@@ -16,6 +16,21 @@
           </el-radio>
         </template>
       </el-table-column>
+      <el-table-column :label="'单位名称' | $lc" align="center" show-overflow-tooltip>
+        <template slot-scope="{ row }">
+          {{ row.memberName }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="'角色名称' | $lc" align="center" show-overflow-tooltip>
+        <template slot-scope="{ row }">
+          {{ row.roleName }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="'人员名称' | $lc" align="center" show-overflow-tooltip>
+        <template slot-scope="{ row }">
+          {{ row.userName }}
+        </template>
+      </el-table-column>
       <el-table-column :label="'节点名称' | $lc" align="center" show-overflow-tooltip>
         <template slot-scope="{ row }">
           {{ row.taskName }}
@@ -25,16 +40,28 @@
         <template slot-scope="{ row }">{{ row | userF }}</template>
       </el-table-column>
     </el-table>
-    <div slot="footer" class="m-t text-c">
-      <el-button type="primary" @click="confirmFn">{{ type === 'approvalTo' ? $lc('批准') : $lc('驳回') }}</el-button>
-      <el-button @click="$emit('close')">{{ '取消' | $lc }}</el-button>
+
+    <div slot="footer" class="m-t">
+      <div v-if="showRetraceFlowC">
+        <el-radio-group v-model="isJump" class="flex-column">
+          <el-radio label="0">{{ '重走流程' | $lc }}</el-radio>
+          <el-radio label="1"
+            >{{ '不重走流程' | $lc }}
+            <i class="n20-icon-xinxitishi" v-title="tips" style="color: var(--color-warning)"></i
+          ></el-radio>
+        </el-radio-group>
+      </div>
+      <div class="text-c">
+        <el-button type="primary" @click="confirmFn">{{ type === 'approvalTo' ? $lc('批准') : $lc('驳回') }}</el-button>
+        <el-button @click="$emit('close')">{{ '取消' | $lc }}</el-button>
+      </div>
     </div>
   </cl-page>
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
+import { $lc } from '../../utils/i18n/index'
 import ClPage from '../PageLayout/page.vue'
 export default {
   components: {
@@ -57,6 +84,10 @@ export default {
     taskId: {
       type: String,
       default: ''
+    },
+    showRetraceFlow: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -66,9 +97,18 @@ export default {
       },
       stlV: undefined,
       list: [],
+      isJump: undefined,
       tableData: []
     }
   },
+  computed: {
+    showRetraceFlowC() {
+      return this.showRetraceFlow
+    },
+    tips() {
+      return $lc(`此模式下被回退节点提交后将绕过中间已办节点，造成流程不严谨，谨慎使用！`)
+    }
+  },
   mounted() {
     axios
       .get(`/bems/activiti/sample/getTaskMoveVos/${this.taskId}/${this.type === 'approvalTo' ? 1 : 0}`, null, {
@@ -97,7 +137,7 @@ export default {
         this.$message.warning($lc('请选择节点'))
         return
       }
-      this.$emit('confirm', this.stlV)
+      this.$emit('confirm', this.stlV, this.isJump)
     }
   }
 }

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -1,24 +1,117 @@
 <template>
-  <div class="approve-msg-slt">
-    <el-select
+  <div class="approve-msg-slt showAppOpi-tips">
+    <!-- <el-select
       v-model="approveMsgSlt"
       class="w-100p"
       style="max-width: 80vw"
       clearable
       :multiple="multiple"
       collapse-tags
-      :placeholder="'请选择审批意见' | $lc"
+      :placeholder="'常用审批意见，选择后将自动填充至下方输入框，您可在此基础上修改' | $lc"
       @change="changeFn"
     >
       <el-option v-for="(item, i) in approveMsgList" :key="i" :label="item.suggestion" :value="item.suggestion" />
-    </el-select>
+    </el-select> -->
+
+    <el-popover v-model="show" placement="top" width="400" trigger="click">
+      <div class="flex-box flex-lr flex-v">
+        <div class="flex-box flex-v" style="margin-left: -12px">
+          <cl-secondary-tab :init="name" :data="list" />
+          <i
+            v-title="$lc('常用审批意见，选择后将自动填充至下方输入框，您可在此基础上修改')"
+            class="n20-icon-xinxitishi m-b-s"
+            style="color: var(--color-text-secondary)"
+          ></i>
+        </div>
+        <div v-if="selectKey === 'zdy'">
+          <!-- <el-button type="text" size="small" @click="clickFn('保存为常用语')">{{ $lc('保存为常用语') }}</el-button> -->
+          <i v-if="hasZdy" class="n20-icon-shezhi m-l-s shezhi" @click="setSpr = true"></i>
+        </div>
+      </div>
+
+      <div style="height: 300px">
+        <div v-if="tableData.length > 0" style="height: 100%; overflow-y: auto">
+          <p
+            v-for="(value, index) in tableData"
+            :key="index"
+            v-title="value.suggestion"
+            class="select"
+            type="text"
+            size="small"
+            @click="selectFn(value)"
+          >
+            {{ value.suggestion }}
+          </p>
+        </div>
+        <CLEmpty v-else :type="'empty'" :content="$lc('暂无数据')" :height="200" />
+      </div>
+      <el-link slot="reference" :underline="false" icon="el-icon-chat-dot-round">{{ $lc('常用审批意见') }}</el-link>
+    </el-popover>
+    <ClDialog v-drag :visible.sync="setSpr" :title="'常用审批意见' | $lc" width="800px" append-to-body top="7.5vh">
+      <div class="flex-box flex-r flex-v m-b-s">
+        <i
+          v-title="$lc('此处只可设置个人常用审批意见,全局需到工作流审批意见设置中设置')"
+          class="n20-icon-xinxitishi m-r-s"
+          style="color: var(--color-text-secondary)"
+        ></i>
+        <el-button type="primary" size="mini" @click="clickFn('新增')">{{ $lc('新增') }}</el-button>
+        <el-button type="danger" plain size="mini" @click="clickFn('批量删除')">{{ $lc('删除') }}</el-button>
+      </div>
+      <ClTablePro
+        ref="xTable"
+        :data="tableDataA"
+        :columns="checkColumns"
+        :height="'350px'"
+        @selection-change-method="handleSelectionChange"
+      >
+        <vxe-column
+          slot="suggestion"
+          slot-scope="{ column }"
+          v-bind="column"
+          :field="column.prop"
+          :title="column.label"
+        >
+          <el-input
+            v-model="row.suggestion"
+            slot-scope="{ row }"
+            placeholder="请输入"
+            size="normal"
+            clearable
+            @change="row.appNoType = 'add'"
+          />
+        </vxe-column>
+        <vxe-column slot="operate" slot-scope="{ column }" v-bind="column" :field="column.prop" :title="column.label">
+          <el-button
+            slot-scope="{ row, $rowIndex }"
+            type="text"
+            size="default"
+            @click="clickFn('删除', $rowIndex, row)"
+            >{{ $lc('删除') }}</el-button
+          >
+        </vxe-column>
+      </ClTablePro>
+      <div slot="footer" class="flex-box flex-c flex-v">
+        <el-button type="primary" @click="clickFn('保存')">{{ $lc('保存') }}</el-button>
+        <el-button plain @click="setSpr = false">{{ $lc('取消') }}</el-button>
+      </div>
+    </ClDialog>
   </div>
 </template>
 
 <script>
-// import { $lc } from '../../utils/i18n/index'
+import clSecondaryTab from '../SecondaryTab/index.vue'
+import ClDialog from '../Dialog'
+import CLEmpty from '../Empty/index.vue'
+import ClTablePro from '../TablePro/index.vue'
+import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
 export default {
+  components: {
+    clSecondaryTab,
+    ClDialog,
+    CLEmpty,
+    ClTablePro
+  },
   props: {
     taskId: {
       type: [String, Number],
@@ -35,16 +128,151 @@ export default {
   },
   data() {
     return {
+      list: [
+        {
+          name: $lc('常用审批意见'),
+          key: 'zdy'
+        }
+        /* { name: $lc('全局'), key: 'system' } */
+      ],
+      name: $lc('常用审批意见'),
+      selectKey: 'zdy',
       approveMsgSlt: [],
       approveMsgList: [],
-      multiple: false
+      multiple: false,
+      setSpr: false,
+      tableData: [],
+      checkColumns: [
+        {
+          type: 'checkbox',
+          static: 'pre' // 静态不被"显示列"显示的,且最终会被拼接到"显示列"排序后的表格的"前面"
+        },
+        {
+          label: $lc('审批意见'),
+          prop: 'suggestion',
+          slotName: 'suggestion',
+          align: 'left',
+          'show-overflow-tooltip': true
+        },
+        {
+          slotName: 'operate',
+          label: $lc('操作'),
+          width: '100px',
+          static: 'next' // 静态不被"显示列"显示的,且最终会被拼接到"显示列"排序后的表格的"后面"
+        }
+      ],
+      tableDataA: [],
+      selectValue: [],
+      approveMsgListIsAll: [],
+      hasZdy: false,
+      show: false,
+      deleteList: []
     }
   },
   mounted() {
+    this.getAction()
     this.getData()
     this.getIsMultiple()
   },
   methods: {
+    // 查询是否显示审批意见
+    getAction() {
+      try {
+        this.$axios.get('/bems/activiti/actAppOpi/isShowOpiUser', {}, { loading: false, noMsg: true }).then((res) => {
+          if (res.data === '1') {
+            this.hasZdy = true
+          } else {
+            this.hasZdy = false
+          }
+        })
+      } catch (error) {
+        this.hasZdy = false
+      }
+    },
+    clickFn(type, index, row) {
+      let V
+      let list
+      switch (type) {
+        case '保存为常用语':
+          this.$axios.post('/bems/activiti/actAppOpi/saveAppOpi', { message: this.message }).then((res) => {
+            if (res.code === 200) {
+              this.$message.success('保存成功')
+            }
+          })
+          break
+        case '保存':
+          V = this.tableDataA.some((d) => !d.suggestion)
+          if (V) {
+            return this.$message.error('审批意见不能为空')
+          }
+          list = []
+          this.tableDataA.forEach((d) => {
+            d.appNoType && list.push(d)
+          })
+          this.deleteList.forEach((d) => {
+            d.appNoType && list.push(d)
+          })
+          this.$axios.post('/bems/activiti/actAppOpi/saveList', list).then((res) => {
+            if (res.code === 200) {
+              this.$message.success('保存成功')
+              this.setSpr = false
+              this.show = true
+              this.getData()
+            }
+          })
+          break
+        case '新增':
+          this.tableDataA.push({
+            appNoType: 'add',
+            suggestion: '',
+            key: this.tableDataA.length,
+            isAll: '2',
+            isEnable: '1',
+            belongUserno: sessionStorage.getItem('userNo')
+          })
+          break
+        case '删除':
+          if (row.id) this.deleteList.push({ ...row, appNoType: 'delte' })
+          this.tableDataA.splice(index, 1)
+          break
+        case '批量删除':
+          if (this.selectValue.length === 0) {
+            this.$message.warning('请选择要删除的数据')
+            return false
+          }
+          this.selectValue.forEach((item) => {
+            if (item.id) this.deleteList.push({ ...item, appNoType: 'delte' })
+          })
+          this.tableDataA = this.tableDataA.filter((item) => !this.selectValue.includes(item))
+          break
+        case '编辑':
+          break
+        default:
+          break
+      }
+    },
+    handleSelectionChange(value) {
+      this.selectValue = value
+    },
+    selectFn(value) {
+      if (this.multiple && this.message) {
+        this.approveMsgSlt = this.message + '\n' + value.suggestion
+      } else {
+        this.approveMsgSlt = value.suggestion
+      }
+      this.show = false
+      this.changeFn()
+    },
+    /* clickTab(item) {
+      this.name = item.name
+      this.selectKey = item.key
+      if (item.key === 'zdy') {
+        this.tableData = this.approveMsgList
+        this.tableDataA = JSON.parse(JSON.stringify(this.tableData))
+      } else {
+        this.tableData = this.approveMsgListIsAll
+      }
+    }, */
     // 审批意见选择是否单选,1是 0 否
     getIsMultiple() {
       axios
@@ -56,13 +284,18 @@ export default {
     getData() {
       if (this.andUser) {
         axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser', null, { loading: false }).then(({ data }) => {
-          this.approveMsgList = this.getOnlyData(data || [])
+          this.tableDataA = this.getOnlyData(JSON.parse(JSON.stringify(data)))?.filter((item) => item.isAll !== '1')
+          this.tableData = this.getOnlyData(data)
         })
       } else {
         axios.post('/bems/activiti/actAppOpi/queryAppOpi', null, { loading: false }).then(({ data }) => {
-          this.approveMsgList = this.getOnlyData(data.list || [])
+          this.tableDataA = this.getOnlyData(JSON.parse(JSON.stringify(data.list || [])))?.filter(
+            (item) => item.isAll !== '1'
+          )
+          this.tableData = this.getOnlyData(data.list || [])
         })
       }
+      this.deleteList = []
     },
     getOnlyData(data) {
       let result = []
@@ -93,10 +326,34 @@ export default {
 </script>
 
 <style>
+.showAppOpi-tips {
+  text-align: right;
+  margin-right: 60px;
+  margin-top: -24px;
+}
 .approve-msg-slt .el-select__tags {
   flex-wrap: nowrap;
 }
 .approve-msg-slt .el-tag {
   max-width: calc(100% - 36px);
 }
+.shezhi,
+.select {
+  cursor: pointer;
+  margin: 6px 0;
+}
+.shezhi:hover {
+  color: #409eff;
+}
+.select {
+  color: #409eff;
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+}
+.select:hover {
+  background-color: #f8f8f8;
+}
 </style>