cloud-web-corejs 1.0.54-dev.272 → 1.0.54-dev.274

package/src/components/wf/content.vue

@@ -72,33 +72,49 @@
           <div>
             <b :class="{on:tabIndex=='1'}" @click="tabIndex='1'">{{ $t2('任务情况', 'components.wf.taskInfo') }}</b>
             <b :class="{on:tabIndex=='2'}" @click="tabIndex='2'" v-if="toTalk">{{ $t2('流程沟通', 'components.wf.wfTalk') }}</b>
-            <b :class="{on:tabIndex=='4'}" @click="tabIndex='4'" v-if="showWfMemo">{{ $t1('发起人附言') }}</b>
             <b :class="{on:tabIndex=='3'}" @click="tabIndex='3'" v-if="showAllWfOpinon">{{ $t2('全部任务情况', 'components.wf.allTaskInfo') }}</b>
           </div>
         </div>
-        <div class="task-situation" v-show="tabIndex=='1'" style="max-height: 500px; overflow: hidden auto;">
-          <div class="item" v-for="wftaskLineData in wftaskData" :key="wftaskLineData.id">
-            <div class="time">
-              {{ wftaskLineData.approveTime ? wftaskLineData.approveTime.substring(0, 10) : '' }}
-              <br/>
-              {{ wftaskLineData.approveTime ? wftaskLineData.approveTime.substring(11) : '' }}
-            </div>
-            <div class="status" :class="taskStatuses[wftaskLineData.type]?taskStatuses[wftaskLineData.type].class:''">
-              {{ taskStatuses[wftaskLineData.type] ? taskStatuses[wftaskLineData.type].value : null }}
+        <div v-show="tabIndex=='1'">
+          <div class="title-five"><b>任务流程</b></div>
+          <div class="task-situation" style="padding-left: 14px;">
+            <div class="item" v-for="wftaskLineData in wftaskData" :key="wftaskLineData.id">
+              <div class="time">
+                {{ wftaskLineData.approveTime ? wftaskLineData.approveTime.substring(0, 10) : '' }}
+                <br/>
+                {{ wftaskLineData.approveTime ? wftaskLineData.approveTime.substring(11) : '' }}
+              </div>
+              <div class="status" :class="taskStatuses[wftaskLineData.type]?taskStatuses[wftaskLineData.type].class:''">
+                {{ taskStatuses[wftaskLineData.type] ? taskStatuses[wftaskLineData.type].value : null }}
+              </div>
+              <i class="circle"></i>
+              <div class="info">
+                <p>
+                  <span class="name">{{ wftaskLineData.taskName }}</span>
+                  <span>{{ $t2('执行人', 'components.wf.approverName') }}：{{ wftaskLineData.approverName }}</span>
+                  <span>
+                  {{ $t2('候选人', 'components.wf.candidateName') }}：
+                  <span class="">{{ wftaskLineData.candidateNames }}</span>
+                </span>
+                </p>
+                <p class="t"><span class="t1">{{ $t2('备注/意见', 'components.wf.opinion') }}：</span><span>{{
+                    wftaskLineData.opinion
+                  }}</span></p>
+              </div>
             </div>
-            <i class="circle"></i>
-            <div class="info">
-              <p>
-                <span class="name">{{ wftaskLineData.taskName }}</span>
-                <span>{{ $t2('执行人', 'components.wf.approverName') }}：{{ wftaskLineData.approverName }}</span>
-                <span>
-                {{ $t2('候选人', 'components.wf.candidateName') }}：
-                <span class="">{{ wftaskLineData.candidateNames }}</span>
-              </span>
-              </p>
-              <p class="t"><span class="t1">{{ $t2('备注/意见', 'components.wf.opinion') }}：</span><span>{{
-                  wftaskLineData.opinion
-                }}</span></p>
+
+          </div>
+          <div class="title-five" v-if="showWfMemo">
+            <b>{{$t1("发起人附言")}}</b>
+            <el-button v-if="wfInfo.toAddMemo" class="button-sty" icon="el-icon-plus" @click="openWfMemoDialog()" type="primary">{{$t1("新增")}}</el-button>
+          </div>
+          <div class="postscript-box">
+            <div class='item' v-for="(item,index) in wfMemoData" :key="index">
+              <div class="txt">{{item.content}}</div>
+              <div class="attach-box" v-if="item.attachmentDTOs && item.attachmentDTOs.length">
+                <baseUpload accept="file" multi="true" :edit="false" :widgetSize="1" :file.sync="item.attachmentDTOs"></baseUpload>
+              </div>
+              <div class="time">{{item.createDate}}</div>
             </div>
           </div>
         </div>
@@ -177,31 +193,6 @@
             </template>
           </vxe-grid>
         </div>
-        <template v-if="showWfMemo">
-          <div class="task-situation" v-show="tabIndex=='4'">
-            <vxe-grid
-              ref="table-wfMemo"
-              :auto-resize="true"
-              v-bind="wfMemoOption"
-              @resizable-change="$vxeTableUtil.onColumnWitchChange"
-              @custom="$vxeTableUtil.customHandle"
-            >
-              <template #form>
-                <div style="margin-bottom: 8px;" class="clearfix">
-                  <div class="fl">
-                    <el-button type="primary" class="button-sty" @click="openWfMemoDialog()"
-                              icon="el-icon-plus" v-if="wfInfo.toAddMemo">{{ $t2('新增') }}
-                    </el-button>
-                  </div>
-                  <div class="fr">
-                      <!-- <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="wfMemoSearchEvent">搜索
-                      </vxe-button> -->
-                  </div>
-                </div>
-              </template>
-            </vxe-grid>
-          </div>
-        </template>
         <div class="task-situation" v-show="showAllWfOpinon && tabIndex=='3'"
              style="max-height: 500px; overflow: hidden auto;">
           <div class="item" v-for="wftaskLineData in allWfTaskOpinions" :key="'allWfTaskOpinions'+wftaskLineData.id">

package/src/components/wf/wf.js

@@ -374,6 +374,7 @@ wfContentMixin = {
         replyId: null
       },
       showWfMemoDialog: false,
+      wfMemoData:[]
     };
   },
   provide() {
@@ -1341,7 +1342,8 @@ wfContentMixin = {
     },
 
     initWfMemo() {
-      let h = this.$createElement;
+      this.wfMemoSearchEvent();
+      /* let h = this.$createElement;
       let tableOption = {
         vue: this,
         tableRef: "table-wfMemo",
@@ -1409,10 +1411,23 @@ wfContentMixin = {
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.wfMemoOption = opts;
-      });
+      }); */
     },
     wfMemoSearchEvent(){
-       this.$refs['table-wfMemo'].commitProxy('reload');
+      //  this.$refs['table-wfMemo'].commitProxy('reload');
+      let that = getTarget(this);
+      that.$http({
+        url: this.current_prefix + "/wf_memo/listPage",
+        method: `post`,
+        data: {
+          uuid: this.wfInfo.uuid,
+        },
+        isLoading: true,
+        success: (res) => {
+          let rows = res?.objx?.records || [];
+          this.wfMemoData = rows;
+        },
+      });
     },
     openWfMemoDialog(row) {
       if(row){