cloud-web-corejs-haier 1.0.4 → 1.0.6

package/src/views/user/wf/wf_obj_config/list.vue

@@ -115,6 +115,11 @@
                             :objConfigItem="objConfigItem" :serviceId="currentRow.serviceId"></wfBizDataSettingDialog>
 
     <importItemDialog v-if="showImportItemDialog" :visiable.sync="showImportItemDialog" @confirm="confirmImportItemDialog"/>
+    <itemOperateDialog v-if="showItemOperateDialog" :visiable.sync="showItemOperateDialog"
+                      @close="closeItemOperateDialog"
+                      @openWfDesignDialog="openWfDesignDialog"
+                      :row="operateItemRow"
+                      :pRow="currentRow"></itemOperateDialog>
   </div>
 </template>
 <script>
@@ -131,8 +136,10 @@ import wfDiyAttributeEdit from '../../../../views/user/wf/wf_diy_attribute/edit'
 import wfBizDataSettingDialog from "./wfBizDataSettingDialog";
 
 import importItemDialog from "./importItemDialog.vue";
+import {getToken} from "@base/utils/auth"
 
-
+import itemOperateDialog from './itemOperateDialog'
+import settingConfig from "@base/settings"
 
 export default {
   name: 'wf_obj_config:list',
@@ -145,7 +152,8 @@ export default {
     scriptDescriptionDialog,
     wfDiyAttributeEdit,
     wfBizDataSettingDialog,
-    importItemDialog
+    importItemDialog,
+    itemOperateDialog
   },
   created() {
   },
@@ -196,7 +204,10 @@ export default {
 
       objConfigItem: null,
       showWfBizDataSettingDialog: false,
-      showImportItemDialog:false
+      showImportItemDialog:false,
+
+      operateItemRow:null,
+      showItemOperateDialog: false
     };
   },
   watch: {
@@ -369,10 +380,9 @@ export default {
       });
     },
     initTableM2() {
-      let startModeMap = {
-        1: this.$t1('节点无候选人，提示异常'),
-        2: this.$t1('节点无候选人，提示警告'),
-        3: this.$t1('节点无候选人，无提示'),
+      let modelValueMap = {
+        CLASSICS: "经典模型",
+        MIMIC: "仿钉钉模型",
       }
       var that = this;
       let tableOption1 = {
@@ -385,8 +395,8 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: this.$t1('流程模版名称'),
-            field: 'modelName',
+            title: this.$t1('流程名称'),
+            field: 'flowName',
             width: 150,
             fixed: 'left'
           },
@@ -396,8 +406,8 @@ export default {
             width: 150
           },
           {
-            title: this.$t1('流程模版KEY'),
-            field: 'modelKey',
+            title: this.$t1('流程编码'),
+            field: 'flowCode',
             width: 150
           },
           {
@@ -420,70 +430,26 @@ export default {
             }
           },
           {
-            title: this.$t1('跳过相邻任务'),
-            field: 'skipAdjacentTask',
+            field: 'published',
+            title: this.$t1('是否发布'),
             width: 150,
             slots: {
               default: ({row}) => {
-                if (row.skipAdjacentTask) {
-                  return [<div class="txt-status">{this.$t1('是')}</div>];
-                } else {
-                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
-                }
-              }
-            }
-          },
-          {
-            title: this.$t1('驳回后提交模式'),
-            field: 'toRejectNode',
-            width: 180,
-            slots: {
-              default: ({row}) => {
-                if (row.toNextNode === 1) {
-                  return [<div class="txt-status">{this.$t1('顺延下一步提交')}</div>];
-                } else if (row.toRejectNode) {
-                  return [<div class="txt-status">{this.$t1('由提交人确定节点提交')}</div>];
+                if (row.published) {
+                  return [<div class="txt-status">{this.$t1('已发布')}</div>];
                 } else {
-                  return [<div class="txt-status s-3">{this.$t1('直接提交到驳回节点')}</div>];
+                  return [<div class="txt-status s-3">{this.$t1('未发布')}</div>];
                 }
               }
             }
           },
           {
-            title: this.$t1('流程启动处理'),
-            field: 'startMode',
-            width: 180,
-            slots: {
-              default: ({row}) => {
-                return startModeMap[row.startMode] || '';
-              }
-            }
-          },
-          {
-            title: this.$t1('跨任务跳过'),
-            field: 'skipSameUserTask',
+            title: this.$t1('设计器模型'),
+            field: 'modelValue',
             width: 150,
             slots: {
               default: ({row}) => {
-                if (row.skipSameUserTask) {
-                  return [<div class="txt-status">{this.$t1('是')}</div>];
-                } else {
-                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
-                }
-              }
-            }
-          },
-          {
-            title: this.$t1('是否允许流程启动更改候选人'),
-            field: 'startNoSetCandidate',
-            width: 230,
-            slots: {
-              default: ({row}) => {
-                if (row.startNoSetCandidate) {
-                  return [<div class="txt-status">{this.$t1('否')}</div>];
-                } else {
-                  return [<div class="txt-status s-3">{this.$t1('是')}</div>];
-                }
+                return modelValueMap[row.modelValue]
               }
             }
           },
@@ -493,7 +459,12 @@ export default {
             width: 200
           },
           {
-            width: 200,
+            field: 'modifyDate',
+            title: this.$t1('修改时间'),
+            width: 150
+          },
+          {
+            width: 100,
             fixed: 'right',
             sortable: false,
             title: '',
@@ -515,7 +486,19 @@ export default {
                   <a
                     href="javascript:void(0);"
                     onClick={() => {
-                      this.wfEdit(row.modelId, this.currentRow.serviceId);
+                      this.openItemOperateDialog(row);
+                    }}
+                    class="a-link"
+                  >
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('流程设置')} placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-setting"/>
+                    </el-tooltip>
+                  </a>
+                  /* <a
+                    href="javascript:void(0);"
+                    onClick={() => {
+                      this.wfEdit(row.definitionId, this.currentRow.serviceId);
                     }}
                     class="a-link"
                   >
@@ -528,10 +511,10 @@ export default {
                     href="javascript:void(0);"
                     class="a-link"
                     onclick={() => {
-                      this.exportWfXml(row);
+                      this.wfPublish(row);
                     }}
                   >
-                    <el-tooltip enterable={false} effect="dark" content={this.$t1('导出')} placement="top"
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('发布')} placement="top"
                                 popper-class="tooltip-skin">
                       <i class="el-icon-upload2"/>
                     </el-tooltip>
@@ -540,14 +523,14 @@ export default {
                     href="javascript:void(0);"
                     class="a-link"
                     onclick={() => {
-                      this.importWfXml(row);
+                      this.wfUnPublish(row);
                     }}
                   >
-                    <el-tooltip enterable={false} effect="dark" content={this.$t1('导入')} placement="top"
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('取消发布')} placement="top"
                                 popper-class="tooltip-skin">
                       <i class="el-icon-download"/>
                     </el-tooltip>
-                  </a>,
+                  </a> */
                 ];
               }
             }
@@ -566,26 +549,41 @@ export default {
           $table1.setCheckboxRow(row, true);
         });
         this.currentRow = row;
+        this.loadTablemM2Data(row)
+      } else {
+        this.$refs['table-m2'].loadData([]);
+      }
+    },
+    loadTablemM2Data(row){
+      if(row && row.id){
         this.$http({
           method: 'post',
           url: '/' + row.serviceId + '/wf_obj_config_item/list',
           data: {objConfigId: row.id || ''},
           success: res => {
             let rows = res.objx || [];
-            /* rows.forEach(function(item) {
-							item.name = row.name;
-						}); */
             this.$refs['table-m2'].loadData(rows);
           }
         });
-      } else {
+      }else{
         this.$refs['table-m2'].loadData([]);
       }
     },
+    openWfDesignDialog(definitionId,serviceId){
+      this.wfEdit(definitionId,serviceId);
+    },
+
+    wfEdit(definitionId, serviceId) {
+      let token = getToken();
+      let Authorization = `Bearer ${token}`;
+      let onlyDesignShow = true;
+      let prefix = this.currentRow.serviceId;
+      if(settingConfig.isTest){
+        this.wfUrl = `http://stdxx.sc.5mall.com/warm-flow-ui/index.html?id=${definitionId}&prefix=${prefix}&onlyDesignShow=${onlyDesignShow}&Authorization=${Authorization}`;
+      }else{
+         this.wfUrl = WEB_PREFIX + `/warm-flow-ui/index.html?id=${definitionId}&prefix=${prefix}&onlyDesignShow=${onlyDesignShow}&Authorization=${Authorization}`;
+      }
 
-    wfEdit(actModelId, serviceId) {
-      //wfType 0:单据流程，1：场景流程
-      this.wfUrl = WEB_PREFIX + '/activiti-explorer/modeler.html?wfType=0&serviceId=' + serviceId + '&modelId=' + actModelId;
       this.dialogActiveName = 'first';
       this.showWfDialog = true;
     },
@@ -706,7 +704,7 @@ export default {
           responseType: "blob",
           resultType: "other",
           callback: res => {
-            let fileName = row.modelName + ".bpmn20.xml"
+            let fileName = row.flowName + ".bpmn20.xml"
             this.saveAs(res,fileName)
           }
         });
@@ -740,6 +738,14 @@ export default {
           });
         }
       });
+    },
+
+    openItemOperateDialog(row){
+      this.operateItemRow = row;
+      this.showItemOperateDialog = true;
+    },
+    closeItemOperateDialog(){
+      this.loadTablemM2Data(this.currentRow)
     }
   }
 };

package/src/views/user/wf/wf_transfer_setting/edit.vue

@@ -96,6 +96,56 @@
                       </el-input>
                     </el-form-item>
                   </td>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1("有效开始时间") }}
+                  </th>
+                  <td>
+                    <el-form-item
+                      prop="startDate"
+                      :rules="[
+                        {
+                          required: true,
+                          trigger: ['blur', 'change'],
+                        },
+                      ]"
+                    >
+                      <el-date-picker
+                        v-model="wfTransferSetting.startDate"
+                        type="datetime"
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        default-time="00:00:00"
+                        :picker-options="$baseStartPickerOptions(wfTransferSetting.endDate)"
+                      ></el-date-picker>
+                    </el-form-item>
+                  </td>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1("有效结束时间") }}
+                  </th>
+                  <td>
+                    <el-form-item
+                      prop="endDate"
+                      :rules="[
+                        {
+                          required: true,
+                          trigger: ['blur', 'change'],
+                        },
+                      ]"
+                    >
+                      <el-date-picker
+                        v-model="wfTransferSetting.endDate"
+                        type="datetime"
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        default-time="23:59:59"
+                        :picker-options="$baseEndPickerOptions(wfTransferSetting.startDate)"
+                      ></el-date-picker>
+                    </el-form-item>
+                  </td>
                 </tr>
                 <tr>
                   <th>{{ $t1("创建人") }}</th>
@@ -147,6 +197,8 @@ export default {
         transferToName: null,
         transferFrom: null,
         transferTo: null,
+        startDate: null,
+        endDate: null,
       },
       showUserDialog1: false,
       showUserDialog2: false,

package/src/views/user/wf/wf_transfer_setting/list.vue

@@ -180,6 +180,16 @@ export default {
             field: "transferToName",
             width: 250,
           },
+          {
+            title: this.$t1("有效开始时间"),
+            field: "startDate",
+            width: 150,
+          },
+          {
+            title: this.$t1("有效结束时间"),
+            field: "endDate",
+            width: 150,
+          },
           {
             title: this.$t1("创建人"),
             field: "_createBy",