Merge pull request 'fix : 移除输出log' (#373) from dj into master

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

src/api/user/user.js

@@ -55,7 +55,7 @@ export const getUserDetail = (userId) => {
 
 // 操作
 export const operate = (data, type) => {
-  console.log(type ,'type');
+  // console.log(type ,'type');
   if(data.userId && type !== '0') return editUser(data)
   else if(type == '0') return editUserOA(data)
   return addUser(data)

src/components/DetailComponent/Opinion.vue

@@ -134,7 +134,7 @@ const handleReject = async () => {
     // ...values
     auditOpinion: _value.value
   }
-  console.log('params', params)
+  // console.log('params', params)
   const res = await rejectTask(params)
   ElNotification({
     title: '提示',

src/components/DetailComponent/ProjectApply.vue

@@ -39,25 +39,7 @@
           <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
         </div>
       </div>
-
     </div>
-    <!--    <div v-if="changeDiagram">-->
-    <!--      <div class="approval-record">-->
-    <!--        <div class="approval-title">-->
-    <!--          <baseTitle title="流程图"></baseTitle>-->
-    <!--          <div class="diagram">-->
-    <!--&lt;!&ndash;            <div class="base-title">流程图</div>&ndash;&gt;-->
-    <!--&lt;!&ndash;            <el-switch&ndash;&gt;-->
-    <!--&lt;!&ndash;                v-model="changeDiagram"&ndash;&gt;-->
-    <!--&lt;!&ndash;                style="&#45;&#45;el-switch-on-color: #13ce66; &#45;&#45;el-switch-off-color:#BEA266"&ndash;&gt;-->
-    <!--&lt;!&ndash;            />&ndash;&gt;-->
-    <!--          </div>-->
-    <!--        </div>-->
-    <!--      </div>-->
-    <!--      <div class="process">-->
-    <!--        <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer"/>-->
-    <!--      </div>-->
-    <!--    </div>-->
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="mode === 'submit'" @click="handleSubmit">提交</el-button>
       <el-button color="#DED0B2" v-else-if="mode === 'resubmit'" @click="handleSubmit">重新提交</el-button>
@@ -245,7 +227,7 @@ const choosePreProcess = () => {
     preProcessArray.push(preProcessObj)
   })
   localFormData.value.preProcess = preProcessArray
-  console.log('localFormData.value.preProcess', localFormData.value.preProcess)
+  // console.log('localFormData.value.preProcess', localFormData.value.preProcess)
   showPreTable.value = false
 }
 
@@ -351,7 +333,7 @@ const handleSubmit = async () => {
     projectId: projectId.value,
     preProcess: JSON.stringify(localFormData.value.preProcess)
   }
-  console.log('params', params)
+  // console.log('params', params)
   let res
   if (props.step === '20') {
     if (props.mode === 'resubmit') {

src/components/PopoverDelete.vue

@@ -66,7 +66,6 @@ const handleCancel = () => {
   visible.value = false
 }
 const handleDelete = () => {
-  console.log('确认')
   emit("delete")
 }
 </script>

src/stores/processStore.js

@@ -39,8 +39,8 @@ export const useProcessStore = defineStore('process', () => {
     }
     const delProcess = (delNode) => {
         processData.value.process.splice(processData.value.process.indexOf(delNode), 1)
-        console.log("删除数据")
+        // console.log("删除数据")
-        console.log(processData.value.process)
+        // console.log(processData.value.process)
     }
 
     const getDesign = () => {

src/views/custom-query/datamodel/index.vue

@@ -317,7 +317,7 @@ const handleEdit = async (id) => {
   restFrom()
   getDataSourceManageDetails(id).then(res => {
     if (res.code === 1000) {
-      console.log('res', res.data)
+      // console.log('res', res.data)
       formRules.value.password[0].required = false
       form.value = res.data
       title.value = "编辑数据模型管理"

src/views/custom-query/echarts-editor/components/ChartsOptions.vue

@@ -256,7 +256,7 @@ const changeChartItem = (event) => {
       }
       arr.push(obj)
     })
-    console.log('arr',arr)
+    // console.log('arr',arr)
     for (const propertyName in option.legend.selected) {
       if (propertyName === item.label) {
         option.legend.selected[propertyName] = true
@@ -296,10 +296,10 @@ const startDrag = (event) => {
         flag.value = false
       }
     } else if (chart === 'pie') {
-      console.log('拖动饼图')
+      // console.log('拖动饼图')
       flag.value = false
     }else if (chart === 'radar') {
-      console.log('拖动雷达')
+      // console.log('拖动雷达')
       flag.value = false
     }
   }

src/views/custom-query/echarts-editor/components/EchartsEditor.vue

@@ -273,7 +273,7 @@ const isShowAxisLine = (type) => {
  * 初始化echarts实例方法
  */
 const initChart = () => {
-  console.log('initChartoption', option)
+  // console.log('initChartoption', option)
   //3.初始化container容器
   myEcharts = echarts.init(chart.value);
   //5.传入数据
@@ -293,7 +293,7 @@ const initChart = () => {
  * 保存数据
  */
 const saveData = () => {
-  console.log('最终initInfo', initInfo)
+  // console.log('最终initInfo', initInfo)
   emit("getFinalInfo", initInfo)
 }
 /**

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

@@ -101,11 +101,11 @@ const compositeParam = (item) => {
   }
 }
 const getAttachment = (val) => {
-  console.log('上传文件getAttachment', val)
+  // console.log('上传文件getAttachment', val)
   formData.value.singleFile = compositeParam(val)
 }
 const getOtherFile = (val) => {
-  console.log('上传文件getOtherFile', val)
+  // console.log('上传文件getOtherFile', val)
   showTable.value = false
   let fileObj = compositeParam(val)
   otherFileList.value.push(fileObj)
@@ -223,7 +223,7 @@ const handleResubmit = (instance) => {
     projectId: route.query.projectId,
     userIds: userIds
   }
-  console.log('重新提交params', params)
+  // console.log('重新提交params', params)
   resubmitPhaseForm(params).then(res => {
     ElNotification({
       title: '提示',

src/views/special-fund/add.vue

@@ -155,7 +155,7 @@ const compositeParam = (item) => {
   }
 }
 const getFile = (val) => {
-  console.log('上传文件', val)
+  // console.log('上传文件', val)
   showTable.value = false
   let fileObj = compositeParam(val)
   formData.value.files.push(fileObj)

src/views/steps/step/Step1.vue

@@ -8,10 +8,10 @@
 import { onMounted } from 'vue';
 
 onMounted(()=>{
-  console.log('步骤一挂载');
+  // console.log('步骤一挂载');
 })
 </script>
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/steps/step/Step2.vue

@@ -8,10 +8,10 @@
 import { onMounted } from 'vue';
 
 onMounted(()=>{
-  console.log('步骤一挂载');
+  // console.log('步骤一挂载');
 })
 </script>
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/steps/step/Step3.vue

@@ -8,10 +8,10 @@
 import { onMounted } from 'vue';
 
 onMounted(()=>{
-  console.log('步骤一挂载');
+  // console.log('步骤一挂载');
 })
 </script>
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/steps/step/Step4.vue

@@ -8,10 +8,10 @@
 import { onMounted } from 'vue';
 
 onMounted(()=>{
-  console.log('步骤一挂载');
+  // console.log('步骤一挂载');
 })
 </script>
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/steps/step/Step5.vue

@@ -8,10 +8,10 @@
 import { onMounted } from 'vue';
 
 onMounted(()=>{
-  console.log('步骤1-5挂载');
+  // console.log('步骤1-5挂载');
 })
 </script>
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/system/department/edit.vue

@@ -60,7 +60,7 @@ const schema = reactive([
 
 const getInfo = async () => {
   const { data } = await getInfoById(route.query.id)
-  console.log("🚀 ~ getInfo ~ res:", data)
+  // console.log("🚀 ~ getInfo ~ res:", data)
   const params = {
     createTime: data.createTime,
     departmentMark: data.departmentMark,
@@ -136,7 +136,7 @@ const setDeptmentInfo = async ({ departmentChargeLeadershipIds = [], departmentH
     departmentId: route.query.id
   }
   const res = await setDeptInfo(params)
-  console.log(res.data);
+  // console.log(res.data);
 }
 
 getInfo()
@@ -145,4 +145,4 @@ getInfo()
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/system/dept/index.vue

@@ -193,7 +193,7 @@ const getList = async () => {
 const getDetail = (deptId) => {
   getDeptDetail(deptId).then(res => {
     if (res.code === 1000) {
-      console.log(res.data)
+      // console.log(res.data)
       if (title.value == "行内新增部门") {
         form.value.parentId = res.data.deptId
       } else {

src/views/system/user/index.vue

@@ -160,7 +160,7 @@ const tableConfig = reactive({
 })
 
 const init = async () => {
-  console.log(authStore.roles,'userinfo');
+  // console.log(authStore.roles,'userinfo');
   if(!authStore.roles.includes('superAdmin')) {
     searchConfig.value = searchConfig.value.slice(1)
   }
@@ -169,7 +169,7 @@ const init = async () => {
   searchConfig.value.find(item=>item.prop == 'departmentId').props.data = data
   const res = await getSubCompOpt()
   searchConfig.value.find(item=>item.prop == 'subCompanyId').props.data = res.data
-  console.log("🚀 ~ init ~ searchConfig.value:", searchConfig.value)
+  // console.log("🚀 ~ init ~ searchConfig.value:", searchConfig.value)
 }
 
 init()

src/views/workflow/form/components/AmountInputback.vue

@@ -66,7 +66,7 @@ const _value = computed({
     return props.value;
   },
   set(val) {
-    console.log(val,"组件")
+    // console.log(val,"组件")
     emit("update:value", val);
   }
 })
@@ -76,7 +76,7 @@ const chinese = computed(()=>{
 })
 
 const convertCurrency = (money) => {
-  console.log("zhuanhuan ",money)
+  // console.log("zhuanhuan ",money)
   //汉字的数字
   const cnNums = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
   //基本单位

src/views/workflow/form/components/TableList.vue

@@ -187,7 +187,7 @@ const getMinWidth = (col) => {
   }
 }
 const showError = (col, val) => {
-  console.log('showError', val)
+  // console.log('showError', val)
   if (col.props.required) {
     switch (col.valueType) {
       case ValueType.dept:
@@ -208,7 +208,7 @@ const delRow = (i) => {
   _value.value.splice(i, 1)
 }
 const addRow = () => {
-  console.log('添加', props.maxSize, _value.value)
+  // console.log('添加', props.maxSize, _value.value)
   if (props.maxSize > 0 && _value.value.length >= props.maxSize) {
     console.log('限制大小')
     ElMessage.warning(`最多只能添加${props.maxSize}行`)

src/views/workflow/form/components/UserPicker.vue

@@ -79,7 +79,7 @@ const chooseUser=()=>{
   userPicker.value.showUserPicker()
 }
 watch(() => props.perm, (newVal, oldVal) => {
-  console.log('newVal',newVal,userPicker.value)
+  // console.log('newVal',newVal,userPicker.value)
 });
 
 const selected = (select) => {
@@ -93,7 +93,7 @@ const selected = (select) => {
     userInfoList.push(userInfo)
   }
   userList.value = userInfoList
-  console.log('select',userList.value)
+  // console.log('select',userList.value)
 }
 const delDept = (i) => {
   userList.value.splice(i, 1)

src/views/workflow/form/config/DateTimeRangeConfig.vue

@@ -38,7 +38,7 @@ export default {
     }
   },
   created() {
-    console.log("出发了",this.value.placeholder,!this.value.placeholder)
+    // console.log("出发了",this.value.placeholder,!this.value.placeholder)
     if (undefined !== this.value.placeholder){
       this.placeholder = this.value.placeholder
     }else {

src/views/workflow/process/ProcessEdit.vue

@@ -256,7 +256,7 @@ const getDefaultValidErr = () => {
   }
 }
 const showValidFinish = (success, err) => {
-  console.log("处理完成")
+  // console.log("处理完成")
   validResult.value.success = success
   validResult.value.finished = true
   validResult.value.title = success ? '校验完成 😀' : '校验失败 '
@@ -316,11 +316,11 @@ const doPublish = () => {
     type: 'warning'
   }).then(() => {
     let design = processStore.getDesign()
-    console.log(design)
+    // console.log(design)
     let template = {
       ...design
     }
-    console.log(template)
+    // console.log(template)
     addProcessDefinition(template).then(res => {
       ElNotification({
         title: '提示',

src/views/workflow/process/common/DeptPicker.vue

@@ -99,7 +99,7 @@ const getDepartmentTreeList = () => {
   //获取部门信息
   getDepartmentTree().then(res => {
     deptList.value = res.data;
-    console.log("获取部门信息===========", res.data);
+    // console.log("获取部门信息===========", res.data);
   });
 };
 const filterNode = (value, data) => {

src/views/workflow/process/config/ConditionGroupItemConfig.vue

@@ -194,7 +194,7 @@ const selectUser = (value, orgType) => {
 }
 const filterConditionMosr = (list) => {
   processFromPerms.value.forEach((item) => {
-    console.log(item)
+    // console.log(item)
     if (item.required && supportTypes.value.indexOf(item.valueType) > -1){
       list.push({title: item.title, id: item.id, valueType: item.valueType})
     }

src/views/workflow/process/config/TriggerNodeConfig.vue

@@ -315,7 +315,7 @@ const requestTestHandler = () => {
     default:
       break;
   }
-  console.log("==================[测试打印内容]==================")
+  // console.log("==================[测试打印内容]==================")
   request.then(res => {
     console.log(res)
     if (res.status === 200) {

src/views/workflow/process/index.vue

@@ -188,7 +188,6 @@ const viewHistoricalVersion = (row) => {
   loading.value = true
   getHistoryVersion(row.processDefinitionKey).then(res => {
     loading.value = false;
-    // console.log("历史版本数据==", res.data);
     res.data.forEach(row => {
       row.logo = JSON.parse(row.logo);
     });

src/views/workflow/process/nodes/ApprovalNode.vue

@@ -103,7 +103,6 @@ const content = computed(() => {
 //校验数据配置的合法性
 const validate = (err) => {
   try {
-    console.log(props.config.props.assignedType)
     switch (props.config.props.assignedType) {
       case "ASSIGN_USER":
         showError.value = !validate_ASSIGN_USER(err);
@@ -113,7 +112,6 @@ const validate = (err) => {
         break;
       case "SELF_SELECT":
         showError.value = !validate_SELF_SELECT(err);
-        console.log(showError.value);
         break;
       case "LEADER_TOP":
         showError.value = !validate_LEADER_TOP(err);
@@ -139,7 +137,6 @@ const validate = (err) => {
     }
     return showError
   } catch (e) {
-    console.log(e)
     return false;
   }
 }

src/views/workflow/process/nodes/RootNode.vue

@@ -44,7 +44,6 @@ const headerBgc = computed(() => {
 
 
 const validate = () => {
-  console.log("调用成功")
   return []
 }
 

src/views/workflow/task/index.vue

@@ -81,7 +81,6 @@ const queryForm = ref()
 
 const showDetails = (row, column) => {
   if (column.label !== '操作') {
-    console.log(row)
     selectTask.value = row
     nextTick(() => {
       taskDetails.value.init()