Merge pull request 'master' (#572) from master into prod

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

src/components/AttachmentUpload.vue

@@ -231,7 +231,7 @@ const _singleFileValue = computed({
   }
 })
 
-console.log('_singleFileValue',_singleFileValue.value)
+// console.log('_singleFileValue',_singleFileValue.value)
 const _otherFileListValue = computed({
   get() {
     return props.otherFileList;
@@ -279,7 +279,7 @@ watch(() => props.showTable, (newVal) => {
 //   singleFileList.value = newVal
 // }, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
-  console.log('singleFile', newVal)
+  // console.log('singleFile', newVal)
   singleFile.value = newVal
   props.formData.singleFile=newVal
 }, {deep: true})

src/components/DetailComponent/ProjectApply.vue

@@ -532,7 +532,7 @@ const compositeParam = (item) => {
   }
 }
 const getAttachment = (val) => {
-  console.log('上传文件getAttachment', val)
+  // console.log('上传文件getAttachment', val)
   showSingleTable.value = false
   localFormData.value.singleFile = compositeParam(val)
   singleList.value.push(compositeParam(val))
@@ -610,7 +610,7 @@ const handleSubmit = async () => {
   if(sessionParams.value.preProcess&&!localFormData.value.preProcess){
     params.preProcess=JSON.stringify(sessionParams.value.preProcess)
   }
-  console.log(params.preProcess)
+  // console.log(params.preProcess)
   let res
   if (props.step === '20') {
     if (projectChargePersonUserList.value && projectChargePersonUserList.value.length === 0) {

src/views/home/index.vue

@@ -198,21 +198,21 @@ const tableConfigReport = reactive({
       // currentRender: ({row, index}) => (
       // <div style={{width: '300px', textOverflow: 'ellipsis',textAlign:'center'}}>{row.companyName}</div>)
     },
-    {
-      prop: 'approveName',
-      label: '审批人',
-      align: 'center'
-    },
+    // {
+    //   prop: 'approveName',
+    //   label: '审批人',
+    //   align: 'center'
+    // },
     {
       prop: 'deadline',
       label: '截止时间',
       align: 'center'
     },
-    {
-      prop: 'taskNode',
-      label: '当前节点',
-      align: 'center'
-    },
+    // {
+    //   prop: 'taskNode',
+    //   label: '当前节点',
+    //   align: 'center'
+    // },
     {
       prop: 'state',
       label: '状态',

src/views/system/organizationalStructure/index.vue

@@ -16,11 +16,11 @@
         <el-scrollbar>
           <div class="tree scrollbar-dict">
             <el-tree :data="dataList" ref="tree" :props="defaultProps" empty-text="" node-key="value"
-                     :default-expanded-keys="expandedKeys" lazy
-                     @node-click="handleChange" @node-expand="handleChange">
+                     :default-expanded-keys="expandedKeys" default-expand-all
+                     @node-click="handleClick" @node-expand="handleClick">
               <template #default="{ node, data }">
                 <div class="tree-node">
-                  <div style="display: flex;align-items: center;padding: 3px 0">
+                  <div style="display: flex;align-items: center;padding: 3px 0;" :class="data.value === selectNodeKey ? 'highlight': ''">
                     <svg-icon name="oran" v-if="data.type===0" class-name="oran-icon"/>
                     <el-icon v-else-if="data.type===1" :color="data.matrix?'#67C23A':'#fa3534'" style="margin-right: 4px;">
                       <FolderOpened/>
@@ -34,7 +34,6 @@
         </el-scrollbar>
       </div>
     </div>
-
     <div class="layout-right">
       <depart-component v-if="showDept" v-model:value="deptId"/>
       <company-detail v-if="showCompany"  v-model:value="companyId"></company-detail>
@@ -67,6 +66,7 @@ let selectItem = reactive({
 const loading = ref(false);
 const dataList = ref([]);
 const tree = ref([]);
+const selectNodeKey = ref("")
 const isSearch = ref(false);
 const expandedKeys = ref([]);
 const defaultProps = {
@@ -114,7 +114,7 @@ const getList = (flag, type) => {
     if (selectItem.type === -1) {
       dataList.value = res.data;
     } else if (type === 2) {
-      selectItem.children = res.data;
+      selectItem.children = [...res.data]
       if (res.data.length === 0) {
         selectItem.isLeaf = true
         //   selectItem.children = [{
@@ -122,6 +122,7 @@ const getList = (flag, type) => {
         //   }
       }
     }
+    console.log(selectItem.children,"selectItem.children")
   });
 };
 const init = () => {
@@ -135,8 +136,8 @@ const init = () => {
   queryType.chooseName = ""
   getList();
 };
-const handleChange = (item, data) => {
-  console.log('expandedKeys.value',expandedKeys.value)
+const handleClick = (item, data) => {
+  selectNodeKey.value = item.value
   if (item.type === 1) {
     showDept.value = false
     showCompany.value = false
@@ -174,8 +175,11 @@ const handleChange = (item, data) => {
 init()
 
 </script>
-
 <style lang="scss" scoped>
+.highlight{
+  color: black; //节点的字体颜色
+  font-weight: bold;
+}
 $containWidth: 550px;
 .organization-layout {
   display: flex;