Merge remote-tracking branch 'origin/dev' into dev

2022-03-04 13:59:34 +08:00
parent 49bb10278a cb086431b7
commit 729a643d65
5 changed files with 104 additions and 48 deletions
--- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue
+++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue
@@ -74,15 +74,14 @@ export default {
    getList() {
      this.$http.post('/app/appvillagerintegraldeclare/list',null,{
        params: {
-          current: 1,
-          size: 10,
+          current: this.current,
          description : this.keyword,
          applyIntegralType: this.applyIntegralType,
          auditType: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : 1
        }
      }).then(res => {
        if(res?.data){
-          this.integralList = this.current > 1 ? [...this.integralList, ...res.data.records] : res.data.records
+          this.integralList = this.current > 1 ?  [...this.integralList, ...res.data.records]:res.data.records
          this.$forceUpdate()
          this.flag = true
        } 
@@ -108,6 +107,10 @@ export default {
  onShow() {
    document.title = '积分审核'
  },
+  onReachBottom() {
+    this.current ++,
+    this.getList()
+  }
 }
 </script>

--- a/src/apps/AppVillagersCircle/commentList.vue
+++ b/src/apps/AppVillagersCircle/commentList.vue
@@ -43,7 +43,6 @@ export default {
      tabIndex: '',
      showType: false,
      content: '',
-      // typeList: [],
      current: 1,
      topic: '',
      topicType: '',
@@ -83,8 +82,7 @@ export default {
    getList() {
      this.$http.post('/app/appvillagercirclecomment/list',null,{
        params: {
-          current: 1,
-          size: 10,
+          current: this.current,
          topic:this.topic,
          content: this.content,
          auditType: this.tabIndex==0? '': this.tabIndex==1? 0 : 1,
@@ -92,7 +90,7 @@ export default {
        }
      }).then(res=>{
        if(res?.data) {
-          this.data = this.current >1 ? [...this.data, ...this.res.data.records] : res.data.records
+          this.data = this.current >1 ? [...this.data, ...res.data.records]:res.data.records
        }
      })
    },
@@ -104,6 +102,10 @@ export default {
  onShow() {
    document.title = '发布评论审核'
  },
+  onReachBottom() {
+    this.current ++,
+    this.getList()
+  }
 }
 </script>

--- a/src/apps/AppVillagersCircle/infoList.vue
+++ b/src/apps/AppVillagersCircle/infoList.vue
@@ -72,15 +72,14 @@ export default {
    getList() {
      this.$http.post('app/appvillagercircleinfo/list',null,{
        params: {
-          current: 1,
-          size: 10,
+          current: this.current,
          auditType: this.tabIndex == 0 ? '': this.tabIndex == 1 ? 0 : 1,
          topic: this.topic,
          content: this.content
        }
      }).then(res=>{
        if(res?.data) {
-          this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records] : res.data.records
+          this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records]:res.data.records
        }
      })
    },
@@ -100,6 +99,10 @@ export default {
  onShow() {
    document.title = '发布信息审核'
  },
+  onReachBottom() {
+    this.current ++,
+    this.getList()
+  }
 }
 </script>

--- a/src/apps/AppWorkonline/Detail.vue
+++ b/src/apps/AppWorkonline/Detail.vue
@@ -89,19 +89,22 @@
      <div style="background-color: #fff" v-if="current == 0">
        <div class="collapse">
          <u-collapse event-type="close" :arrow="true" :accordion="true">
-            <u-collapse-item v-if="item.length > 0" v-for="(item, index) in inforlist" :title="item[0].groupName" :open="true" :key="index">
+            <u-collapse-item v-if="item.length" v-for="(item, index) in inforlist" :title="item[0] && item[0].groupName" :open="true" :key="index">
              <div v-for="(items, indexs) in item" :key="indexs">
                <div class="item_msg">
                  <!-- 左 -->
                  <span class="msg_lef">{{ items.fieldName }}</span>
-                  <!-- 右 -->
-                  <!-- 字典值 items.dictionaryCode -->
-                  <span class="msg_lright" v-if="items.fieldDataType != 5">{{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }}</span>
-                  <span class="msg_lright" v-else>
-                    <span v-for="(itemL, indexL) in items.fieldValue" :key="indexL"
-                      >{{ $dict.getLabel(items.dictionaryCode, itemL) }}
-                      <!-- <span v-if="indexL < items.fieldValue.length - 1">,</span> -->
-                    </span>
+
+                  <!-- 右 字典值 items.dictionaryCode -->
+                  <!-- 单下拉框 -->
+                  <span class="msg_lright" v-if="items.fieldDataType == 9">
+                    {{ $dict.getDict(items.dictionaryCode, items.fieldValue)[$dict.getLabel(items.dictionaryCode, items.fieldValue)].dictName }}
+                  </span>
+
+                  <span class="msg_lright" v-if="items.fieldDataType != 5 && items.fieldDataType != 9">{{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }}</span>
+
+                  <span class="msg_lright" v-if="items.fieldDataType == 5 && items.fieldDataType != 9">
+                    <span v-for="(itemL, indexL) in items.fieldValue" :key="indexL">{{ $dict.getLabel(items.dictionaryCode, itemL) }} </span>
                  </span>
                </div>
              </div>
@@ -174,7 +177,10 @@
                  <span>{{ item4.fieldValue }}</span>
                </div> -->

-                <span v-if="item.stepType == 2">审批意见:{{ item.opinion }}</span>
+                <span v-if="item.stepType == 2" style="display: flex">
+                  <span style="width: 70px">审批意见:</span>
+                  <span style="color: #f14242"> {{ item.opinion }}</span>
+                </span>

                <div class="examine" v-if="item.stepType == 2">
                  <div class="examine_docx1">
@@ -285,20 +291,17 @@ export default {

            this.inforlist = [[], [], [], [], [], [], [], [], [], []]
            res.data.tableInfo.tableFieldInfos.map((item) => {
-              if (item.groupIndex) {
-                this.inforlist[item.groupIndex - 1].push(item)
-              }
+              this.inforlist[item.groupIndex].push(item)

              if (item.dictionaryCode) {
                this.dictList.push(item.dictionaryCode)
-              }
-              if (item.fieldDataType == 5) {
-                // item.fieldValue = item.fieldValue.split(',')
-              }
-            })

-            this.$dict.load(this.dictList).then(() => {
-              // this.pageShow = true
+                this.$dict.load(this.dictList)
+              }
+
+              if (item.fieldDataType == 5) {
+                item.fieldValue = item.fieldValue && item.fieldValue.split(',')
+              }
            })
          }
        }
--- a/src/apps/AppWorkonline/Opinion.vue
+++ b/src/apps/AppWorkonline/Opinion.vue
@@ -20,11 +20,22 @@

        <!-- 同意意见 -->
        <div v-if="type == 1">
+          <div class="textarea_msgfont">
+            <span class="msgfont">
+              <span> 同意意见:</span>
+            </span>
+            <textarea :maxlength="150" placeholder="请输入" v-model="opinion" class="textarea" clearable="false"> </textarea>
+            <div class="clearns" @click="opinion = ''">清空内容</div>
+            <div class="msg_length">
+              <span class="font">{{ opinion.length }}</span>
+              <span>/150</span>
+            </div>
+          </div>
+
          <div class="list" v-for="(item, index) in list" :key="index">
-            <!-- 1 是 字符串 -->
-            <div class="textarea_msgfont" v-if="item.fieldDataType == 1">
+            <!-- 1 是 字符串item.fieldDataType == 1 -->
+            <!-- <div class="textarea_msgfont">
              <span class="msgfont">
-                <!-- <span class="icon" v-if="item.mustFill == 1">*</span> -->
                <span> {{ item.fieldName }}:</span>
              </span>
              <textarea :maxlength="150" placeholder="请输入" v-model="item.fieldValue" class="textarea" clearable="false"> </textarea>
@@ -33,7 +44,7 @@
                <span class="font">{{ item.fieldValue && item.fieldValue.length }}</span>
                <span>/{{ item.fieldLength }}</span>
              </div>
-            </div>
+            </div> -->

            <!-- 日期 是 8 -->
            <!-- v-if="item.fieldType == 3 && item.fieldDataType == 8" .-->
@@ -48,13 +59,15 @@
            </div>

            <!-- 单选 是 4 -->
-            <div class="calendar" v-if="item.fieldType == 4">
+            <div class="calendar" v-if="item.fieldDataType == 4">
              <div class="left">
                <span class="icon" v-if="item.mustFill == 1">*</span>
                <span> {{ item.fieldName }}:</span>
              </div>
              <div class="left">
-                <u-input type="text" @click="timeSelect(index)" class="right" placeholder="请选择" disabled v-model="item.fieldValue"></u-input>
+                <u-input type="text" @click="showStstus = true" class="right" placeholder="请选择" disabled v-model="item.fieldValue"></u-input>
+
+                <u-select v-model="showStstus" :list="$dict.getDict(item.dictionaryCode)" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
              </div>
            </div>
          </div>
@@ -110,36 +123,31 @@ export default {
      filedIndex: 0,
      fileNameList: [],
      opinion: '',
+      showStstus: false,
    }
  },
  onLoad(options) {
    this.objid = options.id
    this.type = options.type
-
    this.getList()
  },
  onShow() {
    document.title = '审批详情'
  },
-  computed: {},
  watch: {},
-  onShow() {},
-  mounted() {},
  methods: {
    getList() {
      this.$http
        .post(`/app/approv-alapply-info/approval-popup?type=${this.type}&id=${this.objid}`)
        .then((res) => {
          if (res.code == 0) {
-            this.list = res.data.fieldInfos
-            console.log(this.list)
            res.data.fieldInfos.map((item) => {
-              // this.list.push(item)
-              // if (item.fieldDataType == 1) {
-              //   item.fieldValue = ''
-              // }
-              // if (item.fieldType == 3) {
-              // }
+              if (item.fieldType != 3) {
+                item.fieldValue = ''
+              }
+              if (item.fieldType == 3) {
+                this.list.push(item)
+              }
            })
          }
        })
@@ -162,6 +170,10 @@ export default {
      })
    },

+    selectStatus(e) {
+      this.$set(this.list[index], 'fieldValue', this.value)
+    },
+
    btn() {
      // if (this.type == 0 && this.opinion == '') {
      //   return uni.showToast({
@@ -304,6 +316,39 @@ export default {
          }
        }
      }
+      .textarea_msgfont {
+        position: relative;
+        height: 400px;
+        padding: 32px;
+        background-color: #fff;
+
+        .msgfont {
+          font-size: 32px;
+
+          .icon {
+            margin-right: 8px;
+            color: #ff4466;
+          }
+        }
+
+        .textarea {
+          margin-top: 10px;
+        }
+
+        .clearns {
+          color: #1365dd;
+        }
+
+        .msg_length {
+          position: absolute;
+          bottom: 42px;
+          right: 32px;
+
+          .font {
+            color: #999;
+          }
+        }
+      }
    }

    .reply_files {