瀏覽代碼

机构编辑

zhengnaiwen_citu 5 月之前
父節點
當前提交
3cb919237a

+ 2 - 2
src/api/accumulatePoint.js

@@ -20,7 +20,7 @@ export function deleteAccumulatePoint (data) {
   return http.post('', data)
 }
 
-// 积分 删除
+// 积分 模板
 export function getAccumulatePointRule () {
-  return http.post('/employee/score/rule/detail')
+  return http.get('/employee/score/rule/detail')
 }

+ 5 - 6
src/views/humanResources/accumulatePoints/accumulatePointsApply/accumulatePointsApplyEdit.vue

@@ -11,10 +11,6 @@
           'justify-content': 'flex-end',
           'padding-top': '5px'
         }"
-        :contentStyle="{
-          // 'min-height': '20px'
-          // 'flex-direction': 'column'
-        }"
       >
         <el-descriptions-item
           v-for="_item in item.item"
@@ -25,8 +21,8 @@
             <template v-if="_item.inputType === 0">
               <el-input-number
                 size="small"
+                :min="0"
                 v-model="formValues[_item.employeeScoreRuleItemId]"
-                placeholder="数值"
               ></el-input-number>
             </template>
             <template v-if="_item.inputType === 2">
@@ -64,7 +60,10 @@ export default {
     return {
       loading: false,
       items: [],
-      formValues: {}
+      formValues: {
+        1: '是',
+        2: '是'
+      }
     }
   },
   methods: {

+ 4 - 1
src/views/humanResources/accumulatePoints/accumulatePointsApply/index.vue

@@ -69,7 +69,10 @@ export default {
     async onInit () {
       this.loading = true
       try {
-        const { data } = await getAccumulatePointList()
+        const { data } = await getAccumulatePointList({
+          ...this.searchValues,
+          ...this.pageInfo
+        })
         this.items = data.records
         this.total = data.total
       } catch (error) {

+ 11 - 6
src/views/humanResources/organizationStructure/index.vue

@@ -105,12 +105,11 @@ export default {
       this.seriesData = await this.onInit()
       this.graph.setOption(this.option)
       this.graph.on('click', (params) => {
-        const data = getData(params.data.id, this.seriesData)
         if (params.event.target.type === 'tspan') {
-          this.nodes = data
-          this.onGraphHandles(params.event.event)
+          showMenu(params)
           return
         }
+        const data = getData(params.data.id, this.seriesData)
         this.show = false
         if (!params.data.children || !params.data.children.length) {
           return
@@ -130,12 +129,18 @@ export default {
       this.graph.on('contextmenu', (params) => {
         params.event.event.preventDefault()
         if (params.event.target.type === 'tspan') {
-          const data = getData(params.data.id, this.seriesData)
-          this.nodes = data
-          this.onGraphHandles(params.event.event)
+          showMenu(params)
         }
       })
     })
+    const showMenu = (params) => {
+      if (typeof params.data.tag === 'object') {
+        return
+      }
+      const data = getData(params.data.id, this.seriesData)
+      this.nodes = data
+      this.onGraphHandles(params.event.event)
+    }
 
     function getData (id, data) {
       if (data.id === id) {

+ 1 - 1
vue.config.js

@@ -20,7 +20,7 @@ module.exports = defineConfig({
     // https: false,
     proxy: {
       '/api': {
-        target: 'http://192.168.3.86:7654',
+        target: 'https://company.citupro.com:18182/op/base',
         secure: false, // 是否支持 https,默认 false
         changeOrigin: true, // 是否支持跨域
         pathRewrite: {