cloud-web-corejs 1.0.54-dev.265 → 1.0.54-dev.267

package/src/views/bd/setting/request_async_setting/list.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="containt">
-    <el-tabs v-model="activeName" class="tab-box">
+    <el-tabs v-model="activeName" class="tab-box" @tab-click="changeActiveName">
       <el-tab-pane :label="$t1('常规')" name="first">
         <component v-if="showEdit" visible-key="showEdit" :is="editComponentName" :_dataId.sync="dataId"
-                  :parent-target="_self" @reload="$reloadHandle"></component>
+                   :parent-target="_self" @reload="$reloadHandle"></component>
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
@@ -50,16 +50,16 @@
           </vxe-grid>
         </div>
       </el-tab-pane>
-<!--      <el-tab-pane :label="$t1('在途推送数据')" name="pushData">
+      <el-tab-pane :label="$t1('在途推送数据')" name="pushData">
         <div class="grid-height">
-          <push_data_list :flag="1" @openEditDialog="openPushDataEditView"></push_data_list>
+          <push_data_list @openEditDialog="openPushDataEditView" v-if="showPushDataList"></push_data_list>
         </div>
       </el-tab-pane>
       <el-tab-pane :label="$t1('历史推送数据')" name="pushDataH">
         <div class="grid-height">
-          <push_data_h_list :flag="1" @openEditDialog="openPushDataHEditView"></push_data_h_list>
+          <push_data_h_list @openEditDialog="openPushDataHEditView" v-if="showPushDataHList"></push_data_h_list>
         </div>
-      </el-tab-pane>-->
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -74,7 +74,7 @@ import push_data_h_list from "../push_data_h/list.vue";
 
 export default {
   name: 'request_async_setting:list',
-  components: {editView,push_data_list,push_data_h_list},
+  components: {editView, push_data_list, push_data_edit, push_data_h_list, push_data_h_edit},
   data() {
     return {
       activeName: 'second',
@@ -85,7 +85,9 @@ export default {
       vxeOption: {},
       formData: {},
       advancedFormData: {},
-      editComponentName:null
+      editComponentName: null,
+      showPushDataList: false,
+      showPushDataHList: false,
     };
   },
   mounted() {
@@ -107,13 +109,13 @@ export default {
       this.activeName = 'first';
       this.$openEditView('showEdit');
     },
-    openPushDataEditView(id){
+    openPushDataEditView(id) {
       this.dataId = !id || typeof id == 'object' ? 0 : id;
       this.editComponentName = "push_data_edit"
       this.activeName = 'first';
       this.$openEditView('showEdit');
     },
-    openPushDataHEditView(id){
+    openPushDataHEditView(id) {
       this.dataId = !id || typeof id == 'object' ? 0 : id;
       this.editComponentName = "push_data_h_edit"
       this.activeName = 'first';
@@ -277,6 +279,14 @@ export default {
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
         this.vxeOption = opts;
       });
+    },
+    changeActiveName() {
+      if (this.activeName == "pushData") {
+        this.showPushDataList = true;
+      }
+      if (this.activeName == "pushDataH") {
+        this.showPushDataHList = true;
+      }
     }
   }
 };

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

@@ -93,6 +93,34 @@
                       </el-select>
                     </template>
                   </vxe-form-item>
+                  <vxe-form-item :title="$t1('启动人')+':'" field="starterName">
+                    <template v-slot>
+                      <el-input v-model="formData.starterName" size="small" clearable/>
+                    </template>
+                  </vxe-form-item>
+                  <vxe-form-item title="启动时间:">
+                    <template v-slot>
+                      <el-date-picker
+                        v-model="formData.startTime"
+                        type="datetime"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        :picker-options="$baseStartPickerOptions(formData.endTime)"
+                      ></el-date-picker>
+                      <span>-</span>
+                      <el-date-picker
+                        v-model="formData.endTime"
+                        type="datetime"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        :picker-options="$baseEndPickerOptions(formData.startTime)"
+                      ></el-date-picker>
+                    </template>
+                  </vxe-form-item>
                 </vxe-form>
               </template>
             </vxe-grid>

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

@@ -120,6 +120,19 @@
                 </el-form-item>
               </td>
             </tr>
+            <tr>
+              <th>
+                {{ $t1('流程启动不允许更改候选人') }}
+              </th>
+              <td>
+                <el-form-item prop="startNoSetCandidate" :rules="[{ required: false, trigger: 'blur' }]">
+                  <el-radio-group v-model="wfObjConfigItem.startNoSetCandidate">
+                    <el-radio :label="true">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="false">{{ $t1('否') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
+            </tr>
             <tr>
               <th>
                 {{ $t1('任务action脚本') }}<br/>
@@ -204,7 +217,8 @@ export default {
         skipSameUserTask: false,
         toNextNode: null,
         enabled: true,
-        orders:undefined
+        orders: undefined,
+        startNoSetCandidate: false
       },
       showWfObjConfigDialog: false,
       configServiceId: null,
@@ -242,7 +256,7 @@ export default {
           modalStrictly: true,
           success: res => {
             let wfObjConfigItem = res.objx || {};
-            if(wfObjConfigItem.orders===null)wfObjConfigItem.orders = undefined
+            if (wfObjConfigItem.orders === null) wfObjConfigItem.orders = undefined
             if (wfObjConfigItem.toNextNode === 1) {
               wfObjConfigItem.toRejectNode = null
             }

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

@@ -473,6 +473,20 @@ export default {
               }
             }
           },
+          {
+            title: this.$t1('流程启动不允许更改候选人'),
+            field: 'startNoSetCandidate',
+            width: 150,
+            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>];
+                }
+              }
+            }
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),