Merge pull request 'dj' (#365) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/365

src/components/DetailComponent/CollectionDetail.vue

@@ -2,26 +2,31 @@
   <div v-loading="loading">
     <el-form :model="formData" label-width="auto">
       <el-row>
-        <el-col :span="12" v-if="type==='singleDetail'">
+        <el-col :span="6" v-if="type==='singleDetail'">
           <el-form-item label="征集名称">
             <span>{{ formData.requirementName }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="征集类型">
             <span>{{ formData.collectType }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-if="type==='singleDetail'">
+        <el-col :span="6">
-          <el-form-item label="所属公司">
-            <span>{{ formData.companyIds }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
           <el-form-item label="截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="24" v-if="type==='singleDetail'">
+          <el-form-item label="所属公司">
+            <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
+                getCompanyName(formData.companyIds)
+              }}</span>
+            <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
+                 @click="handleExpend">{{ showExpendText }}
+            </div>
+          </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="formData.isSpecialFund">
           <el-form-item label="专项资金">
             <span>{{ formData.specialFund }}</span>
@@ -84,6 +89,8 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {downloadFile} from "@/api/project-demand";
 
 const emit = defineEmits(['update:value'])
+const showExpendText = ref('')
+const showMoreCompany = ref(false)
 const props = defineProps({
   formData: {
     type: Array,
@@ -127,7 +134,26 @@ const _value = computed({
     emit("update:value", val);
   }
 })
-
+const getCompanyName = (data) => {
+  if (data) {
+    return data.join('，')
+  }
+}
+const handleExpend = () => {
+  showMoreCompany.value = !showMoreCompany.value;
+  showExpendClass(showMoreCompany.value, props.formData.companyIds)
+}
+const showExpendClass = (showMoreCompany, data) => {
+  if (!showMoreCompany) {
+    if (data && data.length > 14) {
+      showExpendText.value = '展开'
+      return 'company-style'
+    }
+  } else {
+    showExpendText.value = '收缩'
+    return ''
+  }
+}
 
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
@@ -152,4 +178,15 @@ watch(() => props.processViewer, (newVal) => {
 :deep(.el-empty__description) {
   margin-top: 0;
 }
+
+.company-style {
+  //width: 98%;
+  min-height: 30px;
+  max-height: 60px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
 </style>

src/components/DetailComponent/CompanyPicker.vue

@@ -10,27 +10,15 @@
             <el-button @click="getList()">搜索</el-button>
           </template>
         </el-input>
-<!--        <el-button v-if="isChooseAll" @click="chooseAll">全选</el-button>-->
+        <fvCheckbox :options="checkOptions" v-model="checkList" @change="checkBoxChange"/>
-<!--        <el-button v-else @click="cancelAll">不全选</el-button>-->
-        <!--        <el-checkbox-group v-model="checkBtn" @change="handleChange">-->
-        <!--          <el-checkbox label="全选" value="1" />-->
-        <!--          <el-checkbox label="Option B" value="Value B" />-->
-        <!--          <el-checkbox label="Option C" value="Value C" />-->
-        <!--          <el-checkbox label="disabled" value="Value disabled" disabled />-->
-        <!--          <el-checkbox-->
-        <!--              label="selected and disabled"-->
-        <!--              value="Value selected and disabled"-->
-        <!--              disabled-->
-        <!--          />-->
-        <!--        </el-checkbox-group>-->
         <!-- 人员选择 -->
         <el-empty :image-size="100" description="似乎没有数据" v-show="dataList.length === 0"/>
         <el-scrollbar style="height:87%;">
           <div class="tree">
             <el-tree :data="dataList" ref="tree" :props="defaultProps" empty-text="" node-key="value"
-                     default-expand-all :show-checkbox="showCheckbox" highlight-current
+                     :show-checkbox="showCheckbox" highlight-current default-expand-all
-                     :default-checked-keys="defaultChecked"
+                     :default-checked-keys="defaultChecked" :disabled="disabled"
-                     :check-strictly="true" @node-click="(node,check)=>handle(node,check)"
+                     :check-strictly="!checkStrictly" @node-click="(node,check)=>handle(node,check)"
                      @check-change="handleChange" :filter-node-method="filterNode">
               <template #default="{ node, data }">
                 <div class="tree-node">
@@ -70,6 +58,20 @@
 import {ElMessageBox} from "element-plus";
 import {getSubCompOpt} from "@/api/user/user";
 
+const checkList = ref(['1'])
+const checkStrictly = ref(false)
+const isExpand = ref('展开')
+const expandedKeys = ref(['-1']);
+const checkOptions = ref([
+  {
+    label: isExpand.value,
+    value: '1'
+  },
+  {
+    label: '父子联动',
+    value: '2'
+  },
+])
 const props = defineProps({
   value: {
     type: Array,
@@ -86,7 +88,6 @@ const props = defineProps({
     type: Boolean
   }
 });
-const checkBtn = ref(1)
 const isChooseAll = ref(true);
 let selectItem = reactive({
   type: -1,
@@ -103,7 +104,8 @@ const tree = ref([]);
 const defaultProps = {
   value: "value",
   label: "label",
-  children: "children"
+  children: "children",
+  disabled: "disabled",
 };
 const emit = defineEmits();
 const _value = computed({
@@ -118,22 +120,39 @@ const _value = computed({
 watch(() => filterText.value, (newVal) => {
   tree.value.filter(newVal);
 });
-const matterTree = (list) => {
+const checkBoxChange = (val) => {
+  checkStrictly.value = val.includes('2')
+  let nodes = tree.value.store.nodesMap
+  if (val.includes('1')) {
+    for (const node in nodes) {
+      nodes[node].expanded = true;
+    }
+    isExpand.value = '折叠'
+  } else {
+    for (const node in nodes) {
+      nodes[node].expanded = false;
+    }
+    isExpand.value = '展开'
+  }
+}
+const matterTree = (list, flag) => {
   list.forEach(item => {
-    tree.value.setChecked(item, true)
+    if (!flag&&item.value!==-1) {
+      tree.value.setChecked(item, false)
+    }
     if (item.children !== undefined) {
       matterTree(item.children)
     }
   })
 }
-const cancelAll = () => {
+// const cancelAll = () => {
-  isChooseAll.value = true
+//   isChooseAll.value = true
-  tree.value.setCheckedNodes([])
+//   tree.value.setCheckedNodes([])
-}
+// }
-const chooseAll = () => {
+// const chooseAll = () => {
-  isChooseAll.value = false
+//   isChooseAll.value = false
-  matterTree(dataList.value)
+//   matterTree(dataList.value)
-}
+// }
 const getList = () => {
   getSubCompOpt().then(res => {
     dataList.value = [
@@ -161,10 +180,10 @@ const show = () => {
   getList()
 };
 const handleChange = (data, checked) => {
-  if(data.value==-1&&checked){
+  if (data.value == -1&&checked) {
-    chooseAll()
+    // tree.value.setCheckedNodes(['-1'])
-  }else if(data.value==-1&&!checked){
+    matterTree(dataList.value, false)
-    cancelAll()
+    // return;
   }
   // 左侧有选择框 + 多选
   if (props.multiple) {
@@ -193,7 +212,6 @@ const handleChange = (data, checked) => {
     }
     if (checked) {
       tree.value.setCheckedNodes([data]);
-      // this.$refs.tree.setCheckedKeys([]);
       selectList.value = [data];
     } else if (data === "1") {
       selectList.value = [];

src/components/DetailComponent/ExpenseDetail.vue

@@ -18,7 +18,8 @@
           </el-table-column>
         </template>
         <template v-else>
-          <template v-if="column.prop === 'totalSeparation' || column.prop === 'totalSeparationCost'">
+          <template
+              v-if="(column.prop === 'totalSeparation' || column.prop === 'totalSeparationCost') && (tableData.length- 1) !== scope.$index">
             {{ getTotalSeparation(scope.row, column.prop) }}
           </template>
           <template v-else>
@@ -92,7 +93,7 @@ const getTotalSeparation = (row, prop) => {
     }
   }
   if (totalSeparation !== 0) {
-    return totalSeparation;
+    return totalSeparation.toFixed(2);
   } else {
     return "/"
   }
@@ -165,6 +166,6 @@ const exportTable = () => {
   if (!$table) {
     $table = $e
   }
-  exportExcel($table, tableData.value[0], "四川省国有资产经营投资管理有限责任公司科技创新项目人工成本分摊明细表")
+  exportExcel($table, (5 + (Object.keys(tableData.value[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目人工成本分摊明细表")
 }
 </script>

src/components/NameCircle.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="display: block">
     <slot name="pre"></slot>
     <div class="user-audit">
       <div class="circle-user">
@@ -13,17 +13,12 @@
           </el-icon>
         </div>
       </div>
-      <div class="username" v-if="user.auditOpinion">
-        <div style="margin-bottom: 10px;color: #909399">{{user.operationTime}}</div>
-        <Tooltip :content="user.auditOpinion" placement="bottom-start" width="140" :lines="true"/>
-      </div>
     </div>
   </div>
 </template>
 
 <script setup>
 import {Loading, Close, CircleCheckFilled, MoreFilled} from '@element-plus/icons-vue'
-import {defineProps} from "vue";
 
 const props = defineProps({
   row: {
@@ -90,15 +85,16 @@ init()
   align-items: center;
 
   .circle-user {
-    width: 50px;
+    width: 46px;
-    height: 50px;
+    height: 46px;
     display: flex;
     justify-content: center;
     align-items: center;
     border-radius: 50%;
     border: 1px solid #ACACAC;
     position: relative;
-
+    background-color: #8a7243;
+    color: #fff;
     .el-timeline-item__node {
       position: absolute;
       bottom: 0;
@@ -106,21 +102,6 @@ init()
     }
   }
 
-  .username {
-    //width: 90px;
-    margin-top: 10px;
-    background: #f5f5f5;
-    padding: 5px;
 
-    .el-tooltip__trigger {
-      width: 90px;
-      text-align: center;
-      //padding-top: 2px;
-      //text-align: center;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden
-    }
-  }
 }
 </style>

src/fvcomponents/fvTable/index.vue

@@ -17,7 +17,9 @@
     </div>
     <!-- 列显示配置 -->
     <div v-if="isSettingCol" style="float: right">
-      <el-button v-if="tableConfig.export && tableConfig.export.open" @click="exportTable" color="#DED0B2" style="margin-bottom: 10px">导出</el-button>
+      <el-button v-if="tableConfig.export && tableConfig.export.open" @click="exportTable" color="#DED0B2"
+                 style="margin-bottom: 10px">导出
+      </el-button>
       <el-tooltip effect="dark" content="列配置" placement="bottom">
         <el-button ref="buttonRef" link>
           <el-icon size="18">
@@ -142,7 +144,7 @@ const exportTable = () => {
   if (props.tableConfig.export && props.tableConfig.export) {
     fileName = props.tableConfig.export.fileName
   }
-  exportExcel($table, localData.list[0], fileName)
+  exportExcel($table, Object.keys(localData.list[0]), fileName)
 }
 
 const localData = reactive({

src/utils/export-excel.js

@@ -2,20 +2,20 @@ import {utils} from "xlsx";
 import FileSaver from 'file-saver'
 import XLSX from "xlsx-style-vite";
 
-
+/**
-export function exportExcel($table, row, excelName) {
+ * 导出excel
-  //如果导出后多出空白行则修改rowspan，否则可不用
+ * @param $table 表格html dom元素
-  // var tds = document.querySelectorAll(".el-table__footer td");
+ * @param columnLength 列长度
-  // tds.forEach(td => td.setAttribute("rowspan", "1"));
+ * @param excelName 导出文件名称
-
+ */
+export function exportExcel($table, columnLength, excelName) {
   //从el-table表生成工作簿对象
   //使用原始的格式,保留表格中的格式如%、小数末尾的0等
   let workbook = utils.table_to_book($table, {
     raw: true
   });
   //列宽，需要导出的表格有多少列这里的i就小于多少
-  let keys = Object.keys(row).length
+  for (let i = 1; i < columnLength; i++) {
-  for (let i = 1; i < (5 + (keys - 5) * 5); i++) {
     workbook.Sheets.Sheet1["!cols"].push({wpx: 100});
   }
   //设置单元格样式

src/views/expense-management/share/add.vue

@@ -51,49 +51,49 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="wagesPayable" label="应发工资">
+          <el-table-column prop="wagesPayable" label="应发工资" width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.wagesPayable?'1':rules.wagesPayable">
                 <el-input-number v-model="scope.row.wagesPayable" placeholder="请输入应发工资" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="performance" label="绩效">
+          <el-table-column prop="performance" label="绩效" width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.performance?'1':rules.performance">
                 <el-input-number v-model="scope.row.performance" placeholder="请输入绩效" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="reserveFund" label="公积金">
+          <el-table-column prop="reserveFund" label="公积金" width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.reserveFund?'1':rules.reserveFund">
                 <el-input-number v-model="scope.row.reserveFund" placeholder="请输入公积金" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="socialSecurity" label="社保">
+          <el-table-column prop="socialSecurity" label="社保" width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.socialSecurity?'1':rules.socialSecurity">
                 <el-input-number v-model="scope.row.socialSecurity" placeholder="请输入社保" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="annuity" label="年金">
+          <el-table-column prop="annuity" label="年金" width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.annuity?'1':rules.annuity">
                 <el-input-number v-model="scope.row.annuity" placeholder="请输入年金" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="workday" label="工作日(天)">
+          <el-table-column prop="workday" label="工作日(天)" width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.workday?'1':rules.workday">
                 <el-input-number v-model="scope.row.workday" placeholder="请输入工作日" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="researchDuration" label="研发时长(天)">
+          <el-table-column prop="researchDuration" label="研发时长(天)" width="175">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.researchDuration?'1':rules.researchDuration">
                 <el-input-number v-model="scope.row.researchDuration" placeholder="请输入研发时长" :controls="false"/>
@@ -125,14 +125,24 @@
       <el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
     </div>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <div class="approval-title">
-        <div class="base-title">流程图</div>
+        <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData.operationList"></baseTitle>
-        <el-switch
+        <div v-else></div>
-            v-model="changeDiagram"
+        <div style="display: flex;align-items: center;justify-content: flex-end;">
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+          <div class="base-title">流程图</div>
-        />
+          <el-switch
+              v-model="changeDiagram"
+              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+          />
+        </div>
+      </div>
+      <div class="process">
+        <operation-render
+            v-if="processDiagramViewer&& opentionData.operationList && opentionData.operationList.length > 0&&!changeDiagram"
+            :operation-list="opentionData.operationList"
+            :state="opentionData.state"/>
+        <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
       </div>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="routerName==='Share/add'" @click="handleSubmit(form)">提交</el-button>
@@ -156,6 +166,7 @@ import {
 } from "@/api/expense-manage";
 import {useProcessStore} from '@/stores/processStore.js';
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
 
 const changeDiagram = ref(false)
 const rules = reactive({
@@ -172,6 +183,7 @@ const rules = reactive({
   researchDuration: [{required: true, message: '请输入研发时长', trigger: 'blur'}],
 })
 const processStore = useProcessStore()
+const opentionData = ref()
 const processInstanceData = ref()
 const processDiagramViewer = ref(false)
 const loading = ref(false)
@@ -321,7 +333,7 @@ const handleResubmit = (instance) => {
   })
 }
 
-const getDetailInfo = async () => {
+const getDetailInfo =  () => {
   loading.value = true
   getAllocationDetail(route.query.id).then(res => {
     ElNotification({
@@ -332,6 +344,7 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       getDetailList()
       formData.value = res.data.formData
+      opentionData.value = res.data
       loading.value = false
     }
   })
@@ -387,10 +400,10 @@ const init = async () => {
 const handleBack = () => {
   history.back()
 }
-onMounted(async () => {
+onMounted( () => {
-  await init()
+   init()
   if (route.query.id) {
-    await getDetailInfo()
+     getDetailInfo()
   }
 })
 </script>

src/views/project-demand/requirement/add.vue

@@ -34,12 +34,13 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="所属公司" prop="companyIds" class="tree-select">
-            <div v-if="route.query.id">{{selectedCompanyList}}</div>
+            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ selectedCompanyList }}</div>
-            <div v-else>{{ getName(selectedCompanyList) }}</div>
+            <div v-else :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
+            <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
+                 @click="handleExpend">{{ showExpendText }}
+            </div>
             <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
             </el-button>
-            <!--                        <el-tree-select v-model="formData.companyIds" :data="companyOption"-->
-            <!--                                        filterable clearable :check-strictly="true" multiple/>-->
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -123,8 +124,11 @@ import CompanyPicker from "@/components/DetailComponent/CompanyPicker.vue";
 import {matterTree} from "@/utils/matterTree";
 
 import {useCacheStore} from '@/stores/cache.js'
+
 const cacheStore = useCacheStore()
 const companyRef = ref()
+const showExpendText = ref('')
+const showMoreCompany = ref(false)
 const selectedCompanyList = ref([])
 // const companyList = ref([])
 const changeDiagram = ref(false)
@@ -149,6 +153,7 @@ const processDiagramViewer = ref(false)
 const companyOption = ref([])
 const specialFundOption = ref([])
 const form = ref(null)
+const expendClass = ref()
 const fileList = ref([])
 const loading = ref(false)
 const showTable = ref(true)
@@ -207,7 +212,24 @@ const tableConfig = reactive({
     }
   ]
 })
-
+const handleExpend = () => {
+  showMoreCompany.value = !showMoreCompany.value;
+  showExpendClass(showMoreCompany.value)
+}
+const showExpendClass = (showMoreCompany) => {
+  if (!showMoreCompany) {
+    if (selectedCompanyList.value.length === 0) {
+      showExpendText.value = ''
+      return  ''
+    } else if (selectedCompanyList.value.length>14) {
+      showExpendText.value = '展开'
+      return  'company-style'
+    }
+  } else {
+    showExpendText.value = '收缩'
+    return  ''
+  }
+}
 const getCompanyOptionItem = (val) => {
   if (val !== undefined) {
     val.forEach(item => {
@@ -222,6 +244,7 @@ const getName = (list) => {
 const showCompany = () => {
   companyRef.value.show()
 }
+
 const selected = (select) => {
   for (let val of select) {
     formData.value.companyIds.push(val.value)
@@ -437,6 +460,21 @@ onMounted(async () => {
     width: 750px;
   }
 
+  .company-style {
+    //width: 98%;
+    min-height: 30px;
+    max-height: 60px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+  }
+
+  .company {
+    color: #fff;
+    height: auto;
+  }
 }
 
 :deep(.el-table--fit ) {

src/views/project-demand/requirement/detail.vue

@@ -47,7 +47,7 @@ const getCompanyOptionItem = (val) => {
       matterTree(companyNameArray.value, companyOption.value, item)
     })
   }
-  return companyNameArray.value.join('，');
+  return companyNameArray.value
 }
 const init = async () => {
   if (!route.query.id) return;

src/views/project-management/implementation/uploadFee.vue

@@ -3,7 +3,7 @@
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <el-form :model="tableForm" ref="form" class="query-form">
     <el-table :data="tableForm.tableData" style="width: 100%">
-      <el-table-column prop="time" label="时间">
+      <el-table-column prop="time" label="时间" width="180">
         <template #default="scope">
           <el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
             <el-date-picker
@@ -17,7 +17,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column prop="projectCost" label="项目费用">
+      <el-table-column prop="projectCost" label="项目费用" width="220">
         <template #default="scope">
           <el-form-item prop="projectCost" :rules="scope.row.projectCost?'1':rules.projectCost">
             <el-select v-model="scope.row.projectCost" placeholder="请选择费用性质" clearable filterable>
@@ -31,7 +31,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column prop="researchStage" label="研发阶段">
+      <el-table-column prop="researchStage" label="研发阶段" width="220">
         <template #default="scope">
           <el-form-item prop="researchStage"  :rules="scope.row.researchStage?'1':rules.researchStage">
             <el-select v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable filterable>
@@ -45,7 +45,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column prop="digest" label="摘要">
+      <el-table-column prop="digest" label="摘要" width="220">
         <template #default="scope">
           <el-form-item prop="digest" :rules="scope.row.digest?'1':rules.digest">
             <el-input v-model="scope.row.digest" placeholder="请输入摘要" clearable>
@@ -53,7 +53,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column prop="afterTax" label="税后余额(元)">
+      <el-table-column prop="afterTax" label="税后余额(元)" width="220">
         <template #default="scope">
           <el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
             <el-input v-model="scope.row.afterTax" placeholder="请输入税后余额" clearable>

src/views/special-fund/add.vue

@@ -46,7 +46,7 @@
 
 <script setup lang="jsx">
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElMessageBox, ElNotification} from "element-plus";
+import {ElNotification} from "element-plus";
 import {addFund, resubmitFund, getFundDetail, getFundProcess} from "@/api/special-fund";
 import {useRouter} from "vue-router";
 import {useTagsView} from '@/stores/tagsview.js'

src/views/workflow/common/OperationRender.vue

@@ -7,16 +7,25 @@
                         :color="operation.color"
                         size="large"
                         placement="top">
-
         <el-card>
-          <div style="display: flex;">
+          <div class="card">
-<!--            <avatar-ellipsis :row="3" v-if="operation.userInfo.length > 0" :user-info="operation.userInfo"/>-->
             <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
-              <name-circle :user="user"/>
+              <div>
-            </div>
+                <name-circle :user="user"/>
-            <div style="margin-left: 10px;">
+                <span>{{ user.name }}</span>
-              <div style="color: #c0bebe">{{ operation.operationName }}</div>
+              </div>
-              <div style="font-size: 14px; font-weight: bold;">{{ operation.remark }}</div>
+              <div>
+                <div class="remark">{{ operation.remark }}</div>
+                <div>
+                  <div>{{ operation.operationName }}：</div>
+                  <div>{{ user.name }}</div>
+                </div>
+                <div v-if="user.auditOpinion">
+                  <div style="margin-bottom: 10px;color: #909399">{{ user.operationTime }}</div>
+                  <Tooltip :content="user.auditOpinion" placement="bottom-start" width="140" :lines="true"/>
+                </div>
+              </div>
+
             </div>
           </div>
         </el-card>
@@ -32,7 +41,6 @@
 
 <script setup>
 import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
-import AvatarEllipsis from '../process/common/AvatarEllipsis.vue'
 import NameCircle from "@/components/NameCircle.vue";
 
 const props = defineProps({
@@ -162,7 +170,7 @@ const initOperationFun = (operation) => {
     if (state === 'AGREE' || state === 'AUTO_PASS') {
       operation["icon"] = "CircleCheckFilled"
       operation["color"] = "#0bbd87"
-      operation["remark"] = "  (已同意)"
+      operation["remark"] = "  已同意"
     }
     if (state === 'PASS') {
       operation["icon"] = "SemiSelect"
@@ -172,26 +180,26 @@ const initOperationFun = (operation) => {
     if (state === 'RUNNING') {
       operation["icon"] = "Loading"
       operation["color"] = "#f78f5f"
-      operation["remark"] = "  (处理中)"
+      operation["remark"] = "  处理中"
     }
     //回退
     if (state === 'ROLLBACK') {
       operation["icon"] = "RefreshLeft"
       operation["color"] = "#f78f5f"
-      operation["remark"] = "  (回退成功)"
+      operation["remark"] = "  回退成功"
     }
     //拒绝操作
     if (state === 'REFUSE' || state === 'AUTO_REFUSE') {
       operation["icon"] = "CircleCloseFilled"
       operation["color"] = "#f56c6c"
-      operation["remark"] = "  (拒绝)"
+      operation["remark"] = "  拒绝"
     }
   }
   //抄送
   if (type === 'CC') {
     operation["icon"] = "Promotion"
     operation["color"] = "#3395f8"
-    operation["remark"] = "  (抄送成功)"
+    operation["remark"] = "  抄送成功"
   }
   //评论
   if (type === 'COMMENT') {
@@ -199,7 +207,7 @@ const initOperationFun = (operation) => {
     if (state === 'COMMENT') {
       operation["icon"] = "ChatDotRound"
       operation["color"] = "#0bbd87"
-      operation["remark"] = "  (添加了评论)"
+      operation["remark"] = "  添加了评论"
     }
   }
   //触发器发送http请求
@@ -207,13 +215,13 @@ const initOperationFun = (operation) => {
     operation["icon"] = "Share"
     if (state === 'SUCCESS') {
       operation["color"] = "#0bbd87"
-      operation["remark"] = "  (成功)"
+      operation["remark"] = "  成功"
     } else if (state === 'RUNNING') {
       operation["color"] = "#f78f5f"
-      operation["remark"] = "  (请求中)"
+      operation["remark"] = "  请求中"
     } else {
       operation["color"] = "#f56c6c"
-      operation["remark"] = "  (失败)"
+      operation["remark"] = "  失败"
     }
   }
 
@@ -222,13 +230,13 @@ const initOperationFun = (operation) => {
     operation["icon"] = "Message"
     if (state === 'SUCCESS') {
       operation["color"] = "#0bbd87"
-      operation["remark"] = "  (成功)"
+      operation["remark"] = "  成功"
     } else if (state === 'RUNNING') {
       operation["color"] = "#f78f5f"
-      operation["remark"] = "  (发送中)"
+      operation["remark"] = "  发送中"
     } else {
       operation["color"] = "#f78f5f"
-      operation["remark"] = "  (发送中)"
+      operation["remark"] = "  发送中"
     }
   }
   return operation;
@@ -237,25 +245,73 @@ init()
 </script>
 
 <style lang="scss" scoped>
-
 :deep .el-card__body, .el-main {
   padding: 10px;
 }
 
-.avatar_name {
+.card {
-  //width: 45px;
   display: flex;
-  flex-direction: column;
+  font-size: 15px;
-  align-items: center;
-  position: relative;
-  margin-right: 5px;
 
+  > div:first-child {
+    display: flex;
+  }
+
+  .avatar_name {
+    display: flex;
+    margin-right: 5px;
+
+    > div:first-child {
+      display: flex;
+
+      > span {
+        color: #2a99ff;
+        margin-left: 10px;
+        margin-right: 20px;
+      }
+    }
+
+    > div:nth-child(2) {
+      display: flex;
+      flex-direction: column;
+      color: #8a8a8a;
+
+      .remark {
+        font-weight: bold;
+      }
+
+      > div {
+        margin-bottom: 5px;
+      }
+
+      > div:nth-child(2) {
+        display: flex;
+        margin-top: -5px;
+      }
+    }
+  }
 }
 
+
 .el-timeline-item__node {
   position: absolute;
   bottom: 20px;
   right: 1px;
 }
-
+//.username {
+//  //width: 90px;
+//  margin-top: 10px;
+//  background: #f5f5f5;
+//  padding: 5px;
+//
+//  .el-tooltip__trigger {
+//    width: 90px;
+//    text-align: center;
+//    //padding-top: 2px;
+//    //text-align: center;
+//    text-overflow: ellipsis;
+//    white-space: nowrap;
+//    overflow: hidden
+//  }
+//}
 </style>