cloud-web-corejs 1.0.54-dev.264 → 1.0.54-dev.266

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

@@ -4,9 +4,9 @@
     <template #form>
       <div class="clearfix screen-btns">
         <div class="fl">
-          <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+<!--          <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
             {{ $t1('新增') }}
-          </vxe-button>
+          </vxe-button>-->
         </div>
         <div class="fr">
           <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
@@ -19,22 +19,45 @@
       </div>
       <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
                 @submit="searchEvent" @reset="searchEvent">
-        <vxe-form-item title="推送编码:" field="reqCode">
+        <vxe-form-item :title="$t1('服务名')+':'">
           <template v-slot>
-            <el-input v-model="formData.reqCode" size="small" clearable/>
+            <el-select v-model="serverName">
+              <el-option v-for="(serviceId,index) in serviceIds" :key="index" :value="serviceId"
+                         :label="serviceId"></el-option>
+            </el-select>
           </template>
         </vxe-form-item>
-        <vxe-form-item title="推送名称:" field="reqName">
+        <vxe-form-item :title="$t1('任务编码')+':'">
           <template v-slot>
-            <el-input v-model="formData.reqName" size="small" clearable/>
+            <el-input v-model="formData.taskCode" size="small" clearable/>
           </template>
         </vxe-form-item>
-        <vxe-form-item title="是否启用:" field="enabled">
+        <vxe-form-item :title="$t1('备注')+':'">
           <template v-slot>
-            <el-select v-model="formData.enabled" clearable>
-              <el-option :value="true" label="启用"></el-option>
-              <el-option :value="false" label="禁用"></el-option>
-            </el-select>
+            <el-input v-model="formData.remark" 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>
@@ -46,7 +69,7 @@
 import editView from './edit.vue';
 
 export default {
-  name: 'request_async_setting:list',
+  name: 'push_data_h:list',
   components: {editView},
   data() {
     return {
@@ -58,151 +81,146 @@ export default {
       vxeOption: {},
       formData: {},
       advancedFormData: {},
+      serviceIds: [],
+      serverName: null
     };
   },
+  computed: {
+    current_prefix() {
+      return this.serverName ? `/${this.serverName}` : "";
+    }
+  },
   mounted() {
-    this.initTableList();
+    this.getServiceIds(() => {
+      this.initTableList();
+    })
   },
   methods: {
     searchEvent() {
+      if (!this.serverName) {
+        this.$baseAlert(this.$t1("请选择服务名"));
+        return
+      }
       this.$refs['table-m1'].commitProxy('reload');
     },
     resetEvent() {
+      if (!this.serverName) {
+        this.$baseAlert(this.$t1("请选择服务名"));
+        return
+      }
       this.formData = {};
-      this.advancedFormData = {};
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(id) {
-      this.copyId = 0;
       this.dataId = !id || typeof id == 'object' ? 0 : id;
-      this.activeName = 'first';
-      this.$openEditView('showEdit');
+      this.$emit('openEditDialog', this.dataId);
     },
     initTableList() {
       let that = this;
-      let pushTypeMap = {0: '异步推送', 1: '同步调用'};
+      let autoLoad = false;
+      let serviceIds = this.serviceIds || [];
+      if (serviceIds.length) {
+        this.serverName = serviceIds[0];
+        autoLoad = true;
+      }
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
-        tableName: 'bd_request_async_setting_list-m1',
-        path: USER_PREFIX + '/request_async_setting/listPage',
+        tableName: 'bd_push_data_h_list-m1',
+        path: this.current_prefix + '/push_data_h/listPage',
         param: () => {
           return {
             ...this.formData,
-            ...this.advancedFormData
+            serverName: this.serverName
           }
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '推送名称',
-            field: 'reqName',
+            title: '任务编码',
+            field: 'taskCode',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '推送编码',
-            field: 'reqCode',
+            title: '产生业务数据时间',
+            field: 'generateDate',
+            width: 200,
+          },
+          {
+            title: '插入历史表时间',
+            field: 'hCreateDate',
+            width: 200,
+          },
+          {
+            title: '处理结果描述',
+            field: 'resultDesc',
             width: 150,
-            fixed: 'left'
           },
+
           {
-            title: '请求Url',
-            field: 'url',
+            title: '回传的数据类型',
+            field: 'callbackDataType',
             width: 150
           },
           {
-            title: '请求头',
-            field: 'header',
-            width: 150
+            title: '回传的单据数据编码或ID',
+            field: 'callbackCode',
+            width: 200
           },
-          /*{
-            title: '连接超时',
-            field: 'connectTimeout',
+          {
+            title: '回传的组织编码',
+            field: 'callbackCompanyCode',
             width: 150
           },
           {
-            title: '读取超时',
-            field: 'readTimeout',
-            width: 150
-          },*/
+            title: '别的服务传输数据过来的数据标识',
+            field: 'transfer',
+            width: 250
+          },
           {
-            field: 'enabled',
-            title: this.$t1('是否启用'),
-            width: 150,
-            slots: {
-              default: ({row}) => {
-                if (row.enabled) {
-                  return [
-                    <div class="txt-status">
-                      <span>启用</span>
-                    </div>
-                  ];
-                } else {
-                  return [
-                    <div class="txt-status disable">
-                      <span>禁用</span>
-                    </div>
-                  ];
-                }
-              }
-            }
+            title: '数据唯一标识',
+            field: 'sid',
+            width: 150
           },
           {
-            title: '调度任务编码',
-            field: 'taskCode',
+            title: '冗余字段1',
+            field: 'field1',
             width: 150
           },
           {
-            title: '备注',
-            field: 'remark',
+            title: '冗余字段2',
+            field: 'field2',
             width: 150
           },
           {
-            title: '执行组织编码',
-            field: 'exeCompanyCode',
+            title: '冗余字段3',
+            field: 'field3',
             width: 150
           },
           {
-            field: 'enabled',
-            title: this.$t1('是否启用'),
-            width: 150,
-            slots: {
-              default: ({row}) => {
-                if (row.enabled) {
-                  return [
-                    <div class="txt-status">
-                      <span>启用</span>
-                    </div>
-                  ];
-                } else {
-                  return [
-                    <div class="txt-status disable">
-                      <span>禁用</span>
-                    </div>
-                  ];
-                }
-              }
-            }
+            title: '冗余字段4',
+            field: 'field4',
+            width: 150
           },
           {
-            field: 'createBy',
-            title: this.$t1('创建人'),
+            title: '冗余字段5',
+            field: 'field5',
             width: 150
           },
           {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
+            title: '服务名',
+            field: 'serverName',
             width: 150
           },
           {
-            field: 'modifyBy',
-            title: this.$t1('更新人'),
+            field: 'createBy',
+            title: this.$t1('创建人'),
             width: 150
           },
           {
-            field: 'modifyDate',
-            title: this.$t1('更新时间'),
+            field: 'createDate',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -232,15 +250,26 @@ export default {
             }
           }
         ],
-        config:{
+        config: {
           proxyConfig: {
-            autoLoad: false
+            autoLoad: autoLoad
           }
         }
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
         this.vxeOption = opts;
       });
+    },
+    getServiceIds(callback) {
+      this.$http({
+        url: USER_PREFIX + `/wf_obj_config/wfServiceIds`,
+        method: `post`,
+        data: {},
+        success: res => {
+          this.serviceIds = res.objx || [];
+          callback && callback()
+        }
+      });
     }
   }
 };

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">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :copyId.sync="copyId"
-                  :parent-target="_self" @reload="$reloadHandle"></editView>
+        <component v-if="showEdit" visible-key="showEdit" :is="editComponentName" :_dataId.sync="dataId"
+                   :parent-target="_self" @reload="$reloadHandle"></component>
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
@@ -50,14 +50,14 @@
           </vxe-grid>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t1('在途推送数据')" name="third">
+      <el-tab-pane :label="$t1('在途推送数据')" name="pushData">
         <div class="grid-height">
-          <push_data_list></push_data_list>
+          <push_data_list @openEditDialog="openPushDataEditView" v-if="showPushDataList"></push_data_list>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t1('历史推送数据')" name="fourth">
+      <el-tab-pane :label="$t1('历史推送数据')" name="pushDataH">
         <div class="grid-height">
-          <push_data_h_list></push_data_h_list>
+          <push_data_h_list @openEditDialog="openPushDataHEditView" v-if="showPushDataHList"></push_data_h_list>
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -66,13 +66,15 @@
 
 <script>
 import editView from './edit.vue';
+import push_data_edit from "../push_data/edit.vue";
+import push_data_h_edit from "../push_data_h/edit.vue";
 import push_data_list from "../push_data/list.vue";
 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',
@@ -83,6 +85,9 @@ export default {
       vxeOption: {},
       formData: {},
       advancedFormData: {},
+      editComponentName: null,
+      showPushDataList: false,
+      showPushDataHList: false,
     };
   },
   mounted() {
@@ -100,6 +105,19 @@ export default {
     openEditDialog(id) {
       this.copyId = 0;
       this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.editComponentName = "editView"
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    openPushDataEditView(id) {
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.editComponentName = "push_data_edit"
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    openPushDataHEditView(id) {
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.editComponentName = "push_data_h_edit"
       this.activeName = 'first';
       this.$openEditView('showEdit');
     },
@@ -261,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('创建时间'),