cloud-web-corejs 1.0.113 → 1.0.114

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.113",
+  "version": "1.0.114",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/wf/content.vue

@@ -42,7 +42,7 @@
       <div class="title-name">
         <b>
           <em>{{ $t2('流程主题', 'components.wf.theme') }}：</em>
-          {{ (wfInfo.createDate ? wfInfo.createDate.substring(0, 10) : '') + wfInfo.name }}
+          {{ wfInfo.name }}
         </b>
         <span v-html="wfInfo.statusStr" class="status"></span>
       </div>
@@ -71,35 +71,50 @@
         <div class="title-tab">
           <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=='3'}" @click="tabIndex='3'"
-               v-if="showAllWfOpinon">{{ $t2('全部任务情况', 'components.wf.allTaskInfo') }}</b>
+            <b :class="{on:tabIndex=='2'}" @click="tabIndex='2'" v-if="toTalk">{{ $t2('流程沟通', 'components.wf.wfTalk') }}</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" style="white-space: pre-wrap;">{{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>
@@ -206,6 +221,7 @@
           </div>
         </div>
       </div>
+      <!--沟通-->
       <el-dialog
         v-if="showTalkDialog"
         :visible.sync="showTalkDialog"
@@ -295,6 +311,69 @@
         </span>
       </el-dialog>
 
+      <!--发起人附言-->
+      <el-dialog
+        v-if="showWfMemoDialog"
+        :visible.sync="showWfMemoDialog"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+        :modal="false"
+        custom-class="dialog-style wf-dialog"
+        :append-to-body="true"
+        v-el-drag-dialog
+        v-el-dialog-center
+      >
+        <template #title>
+          <span class="el-dialog__title">{{ $t1('发起人附言') }}<span
+            style="margin-left: 10px;margin-right: 10px;">—</span><b
+            class="f-red" style="font-size: 12px;">{{ $t2('节点', 'components.wf.node') }}：{{
+              wfInfo.taskName
+            }}</b></span>
+        </template>
+        <el-form :model="wfMemoForm">
+          <div id="containt" style="height: 500px;">
+            <table class="table-detail">
+              <tbody>
+              <tr>
+                <th>
+                    <span class="t">
+                      {{ $t1('内容') }}
+                    </span>
+                </th>
+                <td>
+                  <el-form-item field="content">
+                    <el-input type="textarea" :rows="8"
+                              :placeholder="$t1('内容')"
+                              v-model="wfMemoForm.content"></el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                    <span class="t">
+                      {{ $t1('附件') }}
+                    </span>
+                </th>
+                <td>
+                  <baseUpload accept="file" multi="true" :file.sync="wfMemoForm.attachmentDTOs"></baseUpload>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" plain class="button-sty" @click="showWfMemoDialog = false">
+            <i class="el-icon-close el-icon"></i>
+            {{ $t2('取 消', 'system.button.cancel2') }}
+          </el-button>
+          <el-button type="primary" @click="submitWfMemoForm" class="button-sty">
+            <i class="el-icon-check el-icon"></i>
+            {{ $t2('确 定', 'system.button.confirm2') }}
+          </el-button>
+        </span>
+      </el-dialog>
+
       <el-dialog
         v-if="rejectDialogVisible"
         :visible.sync="rejectDialogVisible"