src/components/AppealInfo.vue

@@ -67,7 +67,7 @@
           </van-collapse-item>
           <van-collapse-item name="events">
             <template slot="title">
-              <span class="content-font">{{appealInfo.events.length + '条积分'}}</span>
+              <span class="content-font">{{appealInfo.events.length + '条积分事件'}}</span>
             </template>
             <div class="card-box" v-for="(item,index) in appealInfo.events" :key="index">
               <div class="card-content1">

src/components/RuleCategorySelector.vue

@@ -392,8 +392,15 @@ export default {
         .then((res)=>{
           this.category_list = []
           this.item_list = res.data.data.item_list
-          this.rule_tree = res.data.data.rule_tree
-          this.parse_tree(res.data.data.rule_tree, this.pid)
+          let ruleSet = new Set(res.data.data.rule_tree.map(item => item.id))
+          this.rule_tree = res.data.data.rule_tree.map(item => {
+            let rule = {...item}
+            rule.pid = ruleSet.has(item.pid) ? item.pid : 0
+            return rule
+          })
+
+          // this.rule_tree = res.data.data.rule_tree
+          this.parse_tree(this.rule_tree, this.pid)
           for (let i in this.category_list) {
             this.category_list[i]['checked'] = false
             if (this.category_selected.indexOf(this.category_list[i].id) >= 0) {
@@ -455,7 +462,14 @@ export default {
       this.$axiosUser('get', '/api/pro/integral/rule/trees', params).then((res) => {
         this.category_list = []
         this.item_list = res.data.data.item_list
-        this.rule_tree = res.data.data.rule_tree
+        let ruleSet = new Set(res.data.data.rule_tree.map(item => item.id))
+        this.rule_tree = res.data.data.rule_tree.map(item => {
+          let rule = {...item}
+          rule.pid = ruleSet.has(item.pid) ? item.pid : 0
+          return rule
+        })
+
+        // this.rule_tree = res.data.data.rule_tree
         this.parse_tree(res.data.data.rule_tree, this.pid)
         for (let i in this.category_list) {
           this.category_list[i]['checked'] = false

src/components/RuleCategorySelector1.vue

@@ -11,7 +11,7 @@
             v-for="(item,index) in category_list"
             :key="index"
             :title="item.name"
-            v-show="item.isRoot"
+            v-show="item.pid === 0"
             :class="{on: left_active, no_child: item.child.length === 0}"
           >
             <template v-if="item.child.length > 0">
@@ -361,12 +361,11 @@ export default {
         .then((res)=>{
           this.category_list = []
           // this.rule_tree = res.data.data.rule_tree
-          let ruleSet = new Set(this.rule_tree.map(item => item.id))
+          let ruleSet = new Set(res.data.data.rule_tree.map(item => item.id))
           this.rule_tree = res.data.data.rule_tree.map(item => {
-            return {
-              ...item,
-              isRoot:item.pid === 0 || !ruleSet.has(item.pid)
-            }
+            let rule = {...item}
+            rule.pid = ruleSet.has(item.pid) ? item.pid : 0
+            return rule
           })
           this.parse_tree(this.rule_tree, this.pid)
         })
@@ -385,10 +384,9 @@ export default {
         // this.rule_tree = res.data.data.rule_tree
         let ruleSet = new Set(this.rule_tree.map(item => item.id))
         this.rule_tree = res.data.data.rule_tree.map(item => {
-          return {
-            ...item,
-            isRoot:item.pid === 0 || !ruleSet.has(item.pid)
-          }
+          let rule = {...item}
+          rule.pid = ruleSet.has(item.pid) ? item.pid : 0
+          return rule
         })
         this.parse_tree(this.rule_tree, this.pid)
       })

src/point/view/audit/integralAudit.vue

@@ -61,17 +61,17 @@
        <template v-if="detail_data.item_id && detail_data.rule_id">
           <van-cell-group>
              <NumberInput
-               v-show="detail_data.pid == 0"
+               v-show="isFirstStep"
                title="积分"
                :min="data.item_min_point"
                :max="data.item_max_point"
-               :isForbidSet="detail_data.pid? true:false"
+               :isForbidSet="!isFirstStep"
                required
                v-model="data.point"
                name="积分"
                v-validate="'required'"
              ></NumberInput>
-             <div class="flex-box flex-v-ce jf" v-show="detail_data.item_range_type == 2 && detail_data.pid != 0">
+             <div class="flex-box flex-v-ce jf" v-show="detail_data.item_range_type == 2 && isFirstStep">
                <div>积分</div>
                <div>
                  <span class="red" v-if="data.point > 0">+{{ data.point }}</span>
@@ -86,7 +86,7 @@
          <NumberInput title="积分"
            :min="data.item_min_point"
            :max="data.item_max_point"
-           :isForbidSet="detail_data.pid? true:false"
+           :isForbidSet="!isFirstStep"
            required v-model="data.point"
            name="积分"
            v-validate="'required'">
@@ -98,13 +98,13 @@
           <div class="tip" slot="title">奖票多用于优秀表现和重要事项的表彰</div>
           <van-cell center title="发放奖票">
             <template #right-icon>
-              <van-switch v-model="ticket_count" size="24" :disabled="!!detail_data.pid" />
+              <van-switch v-model="ticket_count" size="24" :disabled="!isFirstStep" />
             </template>
           </van-cell>
         </van-cell-group>
 
         <DateCell
-          v-if="(detail_data.source_type == 2 || detail_data.source_type == 3) && detail_data.pid == 0"
+          v-if="(detail_data.source_type == 2 || detail_data.source_type == 3) && isFirstStep"
           title="发生时间"
           v-model="data.event_time"
           :defaultVal="data.event_default"
@@ -191,6 +191,11 @@ export default {
       maxDate: new Date()
     };
   },
+  computed:{
+    isFirstStep(){
+      return this.detail_data && ((this.detail_data.pid === 0 && this.detail_data.step === 0 || this.detail_data.step === 1))
+    },
+  },
   watch: {
     select_cate(val) {
       this.item_list = [];

src/point/view/integral/approval_list.vue

@@ -37,8 +37,8 @@
                   &nbsp;<van-tag type="primary">{{sourceTypeMap[item.source_type] || '--'}}</van-tag>
                 </span>
                 <span v-if="filter.type === 'reviewed' && item.status !== 0 && item.status !== 2">
-                  <span class="task-item__point red" v-if="item.review_point >= 0">+{{ item.review_point }}{{ $getTypesName(item.pt_id) }}</span>
-                  <span class="task-item__point green" v-else>{{ item.review_point }}{{ $getTypesName(item.pt_id) }}</span>
+                  <span class="task-item__point red" v-if="item.review_point > 0">+{{ item.review_point }}{{ $getTypesName(item.pt_id) }}</span>
+                  <span class="task-item__point green" v-else-if="item.review_point < 0">{{ item.review_point }}{{ $getTypesName(item.pt_id) }}</span>
                 </span>
               </div>
             </div>

src/point/view/integral/integral_entry_n.vue

@@ -18,7 +18,7 @@
           <!--选择规则  -->
           <RuleCategorySelectorCell v-if="rule_switch" required  ref="rule_selector" name="选择规则"  title="选择规则" v-model="itemRule" :ptId="ptId" scope></RuleCategorySelectorCell>
           <!--选择分类  -->
-          <CategorySelectorCell v-if="!rule_switch" title="选择分类" ref="rule_selector2" v-model="ruleCate" required :ptId="ptId"></CategorySelectorCell>
+          <CategorySelectorCell v-if="!rule_switch" title="选择分类" ref="rule_selector2" v-model="ruleCate" required :ptId="ptId" scope></CategorySelectorCell>
         </van-cell-group>
 
         <div v-for="(item, index) in items" :key="index">

src/point/view/integral/rule_category_add.vue

@@ -4,7 +4,7 @@
     <div class="body_com has_header">
       <scroller>
         <van-cell-group>
-          <van-field v-model="data.name" label="分类名称" name="名称" placeholder="请输入名称" v-validate="'required|max:10'" required maxlength="10" show-word-limit @input="onNameInput"/>
+          <van-field v-model="data.name" label="分类名称" name="名称" placeholder="请输入名称" v-validate="'required|max:20'" required maxlength="20" show-word-limit @input="onNameInput"/>
         </van-cell-group>
         <van-cell-group>
           <CategorySelectorCell title="选择父级分类" v-model="rule_cate" :max="2" :multi="false"></CategorySelectorCell>

src/point/view/task/task_detail_a.vue

@@ -108,6 +108,14 @@
               <span v-else>全公司可见</span>
             </template>
           </van-cell>
+          <van-cell
+            :border="false"
+            v-if="info.reviewer_name"
+            title="审批人"
+            :value="info.reviewer_name"
+            title-class="align_self"
+            value-class="align_self"
+          />
           <van-cell
             :border="false"
             title="任务类型"

src/utils/helper.js

@@ -1,3 +1,3 @@
 export function specialFilter(inputStr){
-  return inputStr.replace(/[^(\w\d\s\u4e00-\u9fa5+:、,.!@$#%*={}：，。！（）【】《》；￥？’”\-\(\)\[\])]/g,"")
+  return inputStr.replace(/[^(\w\d\s\u4e00-\u9fa5+:、,.!@$#%*={}：，。！（）【】《》；￥？?’”\-\(\)\[\])]/g,"")
 }