cloud-web-corejs-haier 1.0.5 → 1.0.6

package/src/components/tempStorage/index.vue

@@ -105,7 +105,7 @@ export default {
       let billData = this.option.data() || {};
       let data = JSON.stringify(billData);
 
-      let that = this.option.vue || this.$$attrs["parent-target"] || this.$parent;
+      let that = this.option.vue || this.$attrs["parent-target"] || this.$parent;
       this.showSubmitDialog = false;
       that.$http({
         url: url,

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

@@ -58,7 +58,6 @@ export default {
         param,
         ...tabParam,
       };
-      debugger;
       if (!tab) {
         tab = newTab;
         if (this.tabs.length >= 30) {

package/src/components/wf/content.vue

@@ -8,6 +8,7 @@
     <template #default>
       <div
         style="margin: -36px 0 8px 124px; position: relative; z-index: 2; height: 28px"
+        v-if="!wfConfig.hiddenAllButton"
       >
         <el-button
           type="success"
@@ -45,7 +46,7 @@
           icon="iconfont icon-zhuanban"
           >{{ $t2("转办", "components.wf.transfer") }}
         </el-button>
-        <el-button
+        <!-- <el-button
           type="primary"
           class="button-sty"
           @click="openUrgingDialog"
@@ -100,7 +101,7 @@
           :wfInfo="wfInfo"
           :wfSendTaskId="wfSendTaskId"
           :current_prefix="current_prefix"
-        ></addOpinionButton>
+        ></addOpinionButton> -->
         <el-button
           type="primary"
           class="button-sty"
@@ -134,8 +135,9 @@
       </div>
       <div class="flow-tree" style="padding-right: 0" v-show="showFlowImg == true">
         <div class="flow-box">
-          <img :src="wfImage" />
-          <el-tooltip
+          <!-- <img :src="wfImage" /> -->
+          <iframe :src="wfImage" style="max-width: 100%;max-height: 100%;min-height:300px;width: 100%"></iframe>
+          <!-- <el-tooltip
             :enterable="false"
             class="item"
             effect="dark"
@@ -147,7 +149,7 @@
               @click="$window.open(wfImage)"
               style="right: 0"
             ></i>
-          </el-tooltip>
+          </el-tooltip> -->
         </div>
       </div>
       <div v-show="showWfInfoTab">
@@ -183,60 +185,54 @@
             >
               <div class="time">
                 {{
-                  wftaskLineData.approveTime
-                    ? wftaskLineData.approveTime.substring(0, 10)
+                  wftaskLineData.modifyDate
+                    ? wftaskLineData.modifyDate.substring(0, 10)
                     : ""
                 }}
                 <br />
                 {{
-                  wftaskLineData.approveTime
-                    ? wftaskLineData.approveTime.substring(11)
+                  wftaskLineData.modifyDate
+                    ? wftaskLineData.modifyDate.substring(11)
                     : ""
                 }}
               </div>
               <div
                 class="status"
-                :class="
-                  taskStatuses[wftaskLineData.type]
-                    ? taskStatuses[wftaskLineData.type].class
-                    : ''
-                "
+                :class="statusTypeMap[wftaskLineData.type]"
               >
                 {{
-                  taskStatuses[wftaskLineData.type]
-                    ? taskStatuses[wftaskLineData.type].value
-                    : null
+                  wftaskLineData.typeDesc
                 }}
               </div>
               <i class="circle"></i>
               <div class="info">
                 <p>
-                  <span class="name">{{ wftaskLineData.taskName }}</span>
+                  <span class="name">{{ wftaskLineData.nodeName }}</span>
                   <span
                     >{{ $t2("执行人", "components.wf.approverName") }}：{{
-                      wftaskLineData.approverName
+                      wftaskLineData.approveName
                     }}</span
                   >
                   <span>
                     {{ $t2("候选人", "components.wf.candidateName") }}：
                     <span>
                       <span style="float: left; width: auto; margin-right: 10px">{{
-                        wftaskLineData.candidateNames
+                        wftaskLineData.collaboratorName
                       }}</span>
-                      <setCandidateButton
+                      <!-- <setCandidateButton
                         v-if="wftaskLineData.flag == 1"
                         style="float: left; width: auto"
                         :current_prefix="current_prefix"
                         :wfInfo="wfInfo"
                         :checkRow="wftaskLineData"
                         @confirm="reloadContent()"
-                      ></setCandidateButton>
+                      ></setCandidateButton> -->
                     </span>
                   </span>
                 </p>
                 <p class="t">
                   <span class="t1">{{ $t2("备注/意见", "components.wf.opinion") }}：</span
-                  ><span>{{ wftaskLineData.opinion }}</span>
+                  ><span>{{ wftaskLineData.message }}</span>
                 </p>
               </div>
             </div>
@@ -244,7 +240,7 @@
           <div class="title-five" v-if="showWfMemo">
             <b>{{ $t1("发起人附言") }}</b>
             <el-button
-              v-if="wfInfo.toAddMemo"
+              v-if="wfInfo.toAddMemo && !wfConfig.hiddenAllButton"
               class="button-sty"
               icon="el-icon-plus"
               @click="openWfMemoDialog()"
@@ -287,7 +283,7 @@
                     class="button-sty"
                     @click="openTalkDialog()"
                     icon="el-icon-chat-dot-square"
-                    v-if="wfInfo.toLinkup"
+                    v-if="wfInfo.toLinkup && !wfConfig.hiddenAllButton"
                     >{{ $t2("沟通", "components.wf.talk") }}
                   </el-button>
                 </div>
@@ -454,7 +450,7 @@
             >{{ $t2("沟通", "components.wf.talk")
             }}<span style="margin-left: 10px; margin-right: 10px">—</span
             ><b class="f-red" style="font-size: 12px"
-              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.taskName }}</b
+              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.nodeName }}</b
             ></span
           >
         </template>
@@ -564,7 +560,7 @@
             >{{ $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
+              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.nodeName }}</b
             ></span
           >
         </template>
@@ -639,7 +635,7 @@
             >{{ $t2("流程驳回", "components.wf.wfReject")
             }}<span style="margin-left: 10px; margin-right: 10px">—</span
             ><b class="f-red" style="font-size: 12px"
-              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.taskName }}</b
+              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.nodeName }}</b
             ></span
           >
         </template>
@@ -654,9 +650,9 @@
                     </span>
                   </th>
                   <td>
-                    <el-form-item label="" field="nodeId">
+                    <el-form-item label="" field="nodeCode">
                       <el-select
-                        v-model="rejectForm.nodeId"
+                        v-model="rejectForm.nodeCode"
                         :placeholder="
                           $t2('请选择驳回节点', 'components.wf.rejectNodePlaceholder')
                         "
@@ -664,7 +660,7 @@
                         <el-option
                           v-for="(rejectNode, index) in rejectNodes"
                           :label="rejectNode.nodeName"
-                          :value="rejectNode.nodeId"
+                          :value="rejectNode.nodeCode"
                           :key="index"
                         ></el-option>
                       </el-select>
@@ -725,7 +721,7 @@
             >{{ $t2("流程通过", "components.wf.wfAgree")
             }}<span style="margin-left: 10px; margin-right: 10px">—</span
             ><b class="f-red" style="font-size: 12px"
-              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.taskName }}</b
+              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.nodeName }}</b
             ></span
           >
         </template>
@@ -818,7 +814,7 @@
             >{{ $t2("流程转办", "components.wf.wfTransfer")
             }}<span style="margin-left: 10px; margin-right: 10px">—</span
             ><b class="f-red" style="font-size: 12px"
-              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.taskName }}</b
+              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.nodeName }}</b
             ></span
           >
         </template>
@@ -912,7 +908,7 @@
             >{{ $t2("流程中断", "components.wf.wfManual")
             }}<span style="margin-left: 10px; margin-right: 10px">—</span
             ><b class="f-red" style="font-size: 12px"
-              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.taskName }}</b
+              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.nodeName }}</b
             ></span
           >
         </template>
@@ -949,7 +945,7 @@
             >{{ $t2("流程撤回", "components.wf.wfRevoke")
             }}<span style="margin-left: 10px; margin-right: 10px">—</span
             ><b class="f-red" style="font-size: 12px"
-              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.taskName }}</b
+              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.nodeName }}</b
             ></span
           >
         </template>
@@ -1012,7 +1008,7 @@
             >{{ $t2("流程加签", "components.wf.wfAddIncreaseSign")
             }}<span style="margin-left: 10px; margin-right: 10px">—</span
             ><b class="f-red" style="font-size: 12px"
-              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.taskName }}</b
+              >{{ $t2("节点", "components.wf.node") }}：{{ wfInfo.nodeName }}</b
             ></span
           >
         </template>