cloud-web-corejs 1.0.54-dev.31 → 1.0.54-dev.311

package/src/components/tempStorage/index.vue

@@ -1,11 +1,11 @@
 <template>
   <span class="button-sty">
-      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain>暂存</el-button>
+      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain :disabled="disabled">暂存</el-button>
       <el-tooltip class="item" effect="dark" content="查看暂存数据" placement="top">
-        <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success" ></el-button>
+        <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success" :disabled="disabled"></el-button>
       </el-tooltip>
 
-      <tempStorageDialog v-if="showTempStorageDialog" :visiable.sync="showTempStorageDialog" 
+      <tempStorageDialog v-if="showTempStorageDialog" :visiable.sync="showTempStorageDialog"
                          @confirm="confirmTempStorageDialog" :storageType="storageType" multi="false"/>
     <el-dialog
       v-if="showSubmitDialog"
@@ -54,7 +54,8 @@ import tempStorageDialog from "./tempStorageDialog.vue";
 
 export default {
   props: {
-    option: Object
+    option: Object,
+    disabled: Boolean,
   },
   components: {
     tempStorageDialog
@@ -82,7 +83,10 @@ export default {
       let url = USER_PREFIX + '/temp_storage/save';
       let billData = this.option.data() || {};
       let data = JSON.stringify(billData)
-      this.$http({
+
+      let that = this.option.vue || this.$$attrs["parent-target"] || this.$parent;
+      this.showSubmitDialog = false;
+      that.$http({
         url: url,
         method: `post`,
         data: {
@@ -99,7 +103,6 @@ export default {
             duration: 500,
             onClose: t => {
               this.option.saveConfirm && this.option.saveConfirm(res);
-              this.showSubmitDialog = false;
             }
           });
         }

package/src/components/tempStorage/tempStorageDialog.vue

@@ -60,7 +60,7 @@
       <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
-        <div class="item" v-for="(checkRow, index) in checkRows">
+        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
           <p>{{ checkRow.storageCode }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>

package/src/components/vb-tabs/x-tabs.vue

@@ -36,14 +36,15 @@ export default {
     }
   },
   methods: {
-    openEditTab(row) {
+    openEditTab(row,param) {
       let paneKeyName = this.paneKeyName;
       let tab = this.tabs.find(tab => tab.data[paneKeyName] === row[paneKeyName])
       if (!tab) {
         tab = {
           data: row,
           showContent: false,
-          dataId: row[paneKeyName]
+          dataId: row[paneKeyName],
+          param
         }
         if (this.tabs.length >= 30) {
           this.tabs.splice(0, 1, tab);

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,51 @@
         <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=='4'}" @click="tabIndex='4'" v-if="showCandidate">{{ $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" 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>
@@ -205,7 +221,22 @@
             </div>
           </div>
         </div>
+        <template v-if="showCandidate">
+          <div v-show="tabIndex=='4'">
+              <div style="width:800px">
+                <vxe-grid
+                  ref="table-candidate"
+                  v-bind="candidateOption"
+                  :data="candidateDatas"
+                  @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                  @custom="$vxeTableUtil.customHandle"
+                ></vxe-grid>
+              </div>
+          </div>
+        </template>
+
       </div>
+      <!--沟通-->
       <el-dialog
         v-if="showTalkDialog"
         :visible.sync="showTalkDialog"
@@ -295,6 +326,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"
@@ -437,6 +531,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title">{{ $t2('流程转办', 'components.wf.wfTransfer') }}<span
@@ -592,6 +687,7 @@
         custom-class="dialog-style wf-dialog"
         v-el-drag-dialog
         v-el-dialog-center
+        :append-to-body="true"
       >
         <template #title>
           <span class="el-dialog__title">{{ $t2('流程加签', 'components.wf.wfAddIncreaseSign') }}<span
@@ -680,7 +776,8 @@
       <setCandidateDialog v-if="showSetCandidateDialog" :visiable.sync="showSetCandidateDialog"
                           @close="closeSetCandidateDialog"
                           :wfInfo="wfInfo"
-                          :current_prefix="current_prefix"></setCandidateDialog>
+                          :current_prefix="current_prefix"
+                          :wfUserRangeEnabled="wfUserRangeEnabled"></setCandidateDialog>
     </template>
   </baseTabPane>
   <div v-else></div>