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

package/src/components/wf/content.vue

@@ -71,10 +71,9 @@
         <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'">{{ $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;">
@@ -178,6 +177,29 @@
             </template>
           </vxe-grid>
         </div>
+        <div class="task-situation" v-show="tabIndex=='4'">
+          <vxe-grid
+            ref="table-wfMemo"
+            :auto-resize="true"
+            v-bind="wfMemoOption"
+            @resizable-change="$vxeTableUtil.onColumnWitchChange"
+            @custom="$vxeTableUtil.customHandle"
+          >
+            <template #form>
+              <div style="margin-bottom: 8px;" class="clearfix">
+                <div class="fl">
+                  <el-button type="primary" class="button-sty" @click="openWfMemoDialog()"
+                             icon="el-icon-plus" v-if="wfInfo.toAddMemo">{{ $t2('新增') }}
+                  </el-button>
+                </div>
+                <div class="fr">
+                    <!-- <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="wfMemoSearchEvent">搜索
+                    </vxe-button> -->
+                </div>
+              </div>
+            </template>
+          </vxe-grid>
+        </div>
         <div class="task-situation" v-show="showAllWfOpinon && tabIndex=='3'"
              style="max-height: 500px; overflow: hidden auto;">
           <div class="item" v-for="wftaskLineData in allWfTaskOpinions" :key="'allWfTaskOpinions'+wftaskLineData.id">
@@ -206,6 +228,7 @@
           </div>
         </div>
       </div>
+      <!--沟通-->
       <el-dialog
         v-if="showTalkDialog"
         :visible.sync="showTalkDialog"
@@ -295,6 +318,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"

package/src/components/wf/wf.js

@@ -363,7 +363,16 @@ wfContentMixin = {
 
       revokeDialogVisible: false,
       revokeForm: {opinion: null},
-      showWfInfoTab: false
+      showWfInfoTab: false,
+
+      wfMemoOption: {},
+      wfMemoForm: {
+        receiverName: null,
+        content: null,
+        attachmentDTOs: [],
+        replyId: null
+      },
+      showWfMemoDialog: false,
     };
   },
   provide() {
@@ -412,6 +421,7 @@ wfContentMixin = {
           this.initWfUserParam();
           this.initTabIndex();
           this.initShowTaskInfo();
+          this.initWfMemo();
         }
       });
     },
@@ -1025,6 +1035,7 @@ wfContentMixin = {
                   h("base-attachment", {
                     props: {
                       option: option,
+                      imageLazy: false
                     },
                   }),
                 ];
@@ -1309,6 +1320,120 @@ wfContentMixin = {
         },
       });
     },
+
+    initWfMemo() {
+      let h = this.$createElement;
+      let tableOption = {
+        vue: this,
+        tableRef: "table-wfMemo",
+        tableName: "wf_table-wfMemo",
+        path: this.current_prefix + "/wf_memo/listPage",
+        param: () => {
+          return {
+            uuid: this.wfInfo.uuid,
+          };
+        },
+        config: {
+          height: 350
+        },
+        columns: [
+          {type: "checkbox", width: 48, resizable: false, fixed: "left"},
+          {
+            title: this.$t1('操作人'),
+            field: "operatorName",
+            width: 150,
+            fixed: "left",
+          },
+          {
+            title: this.$t1('内容'),
+            field: "content",
+            width: 250,
+            showOverflow: false
+          },
+          {
+            width: 150,
+            title: this.$t1('附件'),
+            field: "attachmentImage",
+            sortable: false,
+            slots: {
+              default: ({row, rowIndex}) => {
+                let option = {
+                  title: this.$t1('附件'),
+                  edit: false,
+                  rows: (done) => {
+                    done(row.attachmentDTOs);
+                  },
+                };
+                return [
+                  h("base-attachment", {
+                    props: {
+                      option: option,
+                      imageLazy: false
+                    },
+                  }),
+                ];
+              },
+            },
+          },
+          {
+            title: this.$t2('创建时间', 'system.label.createDate'),
+            field: "createDate",
+            width: 150,
+          },
+          {
+            width: 80,
+            fixed: "right",
+            title: "",
+            sortable: false
+          },
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
+        this.wfMemoOption = opts;
+      });
+    },
+    wfMemoSearchEvent(){
+       this.$refs['table-wfMemo'].commitProxy('reload');
+    },
+    openWfMemoDialog(row) {
+      if(row){
+        this.wfMemoForm = this.$baseLodash.cloneDeep(row);
+      }else{
+        this.wfMemoForm = {
+          uuid: this.wfInfo.uuid,
+          content:null,
+          attachmentDTOs: []
+        }
+      }
+      this.showWfMemoDialog = true;
+    },
+    submitWfMemoForm() {
+      let that = getTarget(this);
+
+      if (!this.wfMemoForm.content) {
+        that.$message({
+          message: this.$t1('请输入内容'),
+          type: "error",
+          duration: 2 * 1000,
+        });
+        return false;
+      }
+
+      this.showWfMemoDialog = false;
+      that.$http({
+        url: this.current_prefix + "/wf_memo/save",
+        data: this.wfMemoForm,
+        method: "post",
+        isLoading: true,
+        success: (resultMsg) => {
+          that.$message({
+            message: resultMsg.content,
+            type: "success"
+          });
+          this.wfMemoSearchEvent();
+        },
+      });
+    },
   }
 };
 

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -968,6 +968,8 @@ modules = {
         if (this.handleCustomEvent(this.field.options.onBeforeClickButton, ["done"], [done]) !== false) {
           done();
         }
+      } else {
+        done();
       }
     },
     handleAddTableDataEvent(flag) {

package/src/layout/components/TagsView/index.vue

@@ -28,8 +28,8 @@
         <i class="el-icon-arrow-right" ayadmin-event="rightPage"
            one-link-mark="yes" @click="$refs.scrollPane.handleScrollRight()"/>
       </el-tooltip>
-      <el-dropdown style="margin-right:10px">
-        <span class="el-dropdown-link">
+      <el-dropdown >
+        <span class="el-dropdown-link" style="padding-right:10px;padding-left:4px;">
           <i class="el-icon-more el-icon--right"></i>
         </span>
         <el-dropdown-menu slot="dropdown">

package/src/views/bd/setting/push_data/edit.vue

@@ -1,17 +1,15 @@
 <template>
   <div class="detail-wrap">
-    <el-form ref="editForm" :model="requestAsyncSetting">
+    <el-form ref="editForm" :model="pushData">
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看异步推送数据') : $t1('新增异步推送数据') }}
+          {{ dataId ? $t1('查看在途推送数据') : $t1('新增在途推送数据') }}
         </div>
         <div class="fr">
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
             {{ $t1('重置') }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
-          </el-button>
         </div>
       </div>
       <baseTabs>
@@ -20,161 +18,56 @@
             <table class="table-detail">
               <tbody>
               <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('推送编码') }}
-                </th>
-                <td colspan="5">
-                  <el-form-item prop="reqCode" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.reqCode" clearable/>
-                  </el-form-item>
-                </td>
+                <th>{{ $t1('任务编码') }}</th>
+                <td>{{ pushData.taskCode }}</td>
+                <th>{{ $t1('产生业务数据时间') }}</th>
+                <td>{{ pushData.generateDate }}</td>
               </tr>
               <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('推送名称') }}
-                </th>
-                <td colspan="5">
-                  <el-form-item prop="reqName" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.reqName" clearable/>
-                  </el-form-item>
-                </td>
+                <th>{{ $t1('回传的数据类型') }}</th>
+                <td>{{ pushData.callbackDataType }}</td>
+                <th>{{ $t1('回传的单据数据编码或ID') }}</th>
+                <td>{{ pushData.callbackCode }}</td>
+                <th>{{ $t1('回传的组织编码') }}</th>
+                <td>{{ pushData.callbackCompanyCode }}</td>
               </tr>
               <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('执行组织编码') }}
-                </th>
-                <td colspan="5">
-                  <el-form-item prop="exeCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.exeCompanyCode" clearable/>
-                  </el-form-item>
-                </td>
-                <td colspan="2"><span class="tips_1">{{ $t1('注：多个用逗号","隔开') }}</span></td>
+                <th>{{ $t1('备注') }}</th>
+                <td colspan="7">{{ pushData.remark }}</td>
               </tr>
-
-<!--              <tr>
-                <th>
-                  {{ $t1('连接超时(ms)') }}
-                </th>
-                <td>
-                  <el-form-item prop="connectTimeout" :rules="[{ required: false, trigger: 'blur' }]">
-                    <base-input-number v-model="requestAsyncSetting.connectTimeout" clearable/>
-                  </el-form-item>
-                </td>
-                <td colspan="2"><span class="tips_1">{{ $t1('注：不填默认10000毫秒') }}</span></td>
-                <th>
-                  {{ $t1('读取超时(ms)') }}
-                </th>
-                <td>
-                  <el-form-item prop="readTimeout" :rules="[{ required: false, trigger: 'blur' }]">
-                    <base-input-number v-model="requestAsyncSetting.readTimeout" clearable/>
-                  </el-form-item>
-                </td>
-                <td colspan="2"><span class="tips_1">{{ $t1('注：不填默认60000毫秒') }}</span></td>
-              </tr>-->
               <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('是否启用') }}
-                </th>
-                <td>
-                  <el-form-item prop="enabled" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-radio-group v-model="requestAsyncSetting.enabled">
-                      <el-radio :label="true">{{ $t1('启用') }}</el-radio>
-                      <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </td>
-
+                <th>{{ $t1('真实数据') }}</th>
+                <td colspan="7">{{ pushData.data }}</td>
               </tr>
               <tr>
-                <th>
-                  {{ $t1('备注') }}
-                </th>
-                <td colspan="7">
-                  <el-form-item prop="remark" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
-                              v-model="requestAsyncSetting.remark"
-                              clearable></el-input>
-                  </el-form-item>
-                </td>
+                <th>{{ $t1('别的服务传输数据过来的数据标识') }}</th>
+                <td colspan="7">{{ pushData.transfer }}</td>
               </tr>
 
               <tr>
-                <th>{{ $t1('创建人') }}</th>
-                <td>{{ requestAsyncSetting.createBy }}</td>
-                <th>{{ $t1('创建时间') }}</th>
-                <td>{{ requestAsyncSetting.createDate }}</td>
-                <th>{{ $t1('更新人') }}</th>
-                <td>{{ requestAsyncSetting.modifyBy }}</td>
-                <th>{{ $t1('更新时间') }}</th>
-                <td>{{ requestAsyncSetting.modifyDate }}</td>
-              </tr>
-              </tbody>
-            </table>
-          </template>
-        </baseTabPane>
-        <baseTabPane :label="$t1('数据组合脚本')">
-          <template #default>
-            <table class="table-detail">
-              <tbody>
-              <tr>
-                <tr>
-                  <th>
-                    {{ $t1('脚本') }}
-                    <scriptTestButton :script.sync="requestAsyncSetting.script"></scriptTestButton>
-                  </th>
-                  <td colspan="7">
-                    <el-form-item prop="postScript" :rules="[{ required: false, trigger: 'blur' }]">
-                      <code-editor mode="java" :readonly="!1" v-model="requestAsyncSetting.script"
-                                   v-if="showCodeEditor"></code-editor>
-                    </el-form-item>
-                  </td>
-                </tr>
-              </tr>
-              </tbody>
-            </table>
-          </template>
-        </baseTabPane>
-        <baseTabPane :label="$t1('推送数据服务信息')">
-          <template #default>
-            <table class="table-detail">
-              <tbody>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('请求Url') }}
-                </th>
-                <td colspan="7">
-                  <el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.url" clearable/>
-                  </el-form-item>
-                </td>
+                <th>{{ $t1('数据唯一标识') }}</th>
+                <td colspan="7">{{ pushData.sid }}</td>
               </tr>
+
               <tr>
-                <th>
-                  {{ $t1('请求头') }}
-                </th>
-                <td colspan="7">
-                  <el-form-item prop="header" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
-                              v-model="requestAsyncSetting.header"
-                              clearable></el-input>
-                  </el-form-item>
-                </td>
+                <th>{{ $t1('冗余字段1') }}</th>
+                <td>{{ pushData.field1 }}</td>
+                <th>{{ $t1('冗余字段2') }}</th>
+                <td>{{ pushData.field2 }}</td>
+                <th>{{ $t1('冗余字段3') }}</th>
+                <td>{{ pushData.field3 }}</td>
+                <th>{{ $t1('冗余字段4') }}</th>
+                <td>{{ pushData.field4 }}</td>
               </tr>
               <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('调度任务编码') }}
-                </th>
-                <td colspan="7">
-                  <el-form-item prop="taskCode" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.taskCode" clearable/>
-                  </el-form-item>
-                </td>
+                <th>{{ $t1('冗余字段5') }}</th>
+                <td>{{ pushData.field5 }}</td>
+                <th>{{ $t1('服务名') }}</th>
+                <td>{{ pushData.serverName }}</td>
+                <th>{{ $t1('创建人') }}</th>
+                <td>{{ pushData.createBy }}</td>
+                <th>{{ $t1('创建时间') }}</th>
+                <td>{{ pushData.createDate }}</td>
               </tr>
               </tbody>
             </table>
@@ -187,10 +80,10 @@
 
 <script>
 export default {
-  name: 'request_async_settingEdit',
+  name: 'push_dataEdit',
   props: {
     _dataId: [String, Number],
-    copyId: [String, Number]
+    serverName: String
   },
   components: {},
   data() {
@@ -198,7 +91,7 @@ export default {
       isEdit: false,
       tabIndex: 'first',
       dataId: '',
-      requestAsyncSetting: {
+      pushData: {
         enabled: true,
         connectTimeout: 10000,
         readTimeout: 60000,
@@ -209,6 +102,11 @@ export default {
       showCodeEditor: false
     };
   },
+  computed: {
+    current_prefix() {
+      return this.serverName ? `/${this.serverName}` : "";
+    }
+  },
   created() {
     if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
   },
@@ -217,13 +115,10 @@ export default {
   },
   methods: {
     getData() {
-      if (this.copyId) {
-        return;
-      }
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
-          url: USER_PREFIX + `/request_async_setting/get`,
+          url: this.current_prefix + `/push_data/get`,
           method: `post`,
           data: {
             id: this.dataId
@@ -231,47 +126,10 @@ export default {
           isLoading: true,
           modalStrictly: true,
           success: res => {
-            this.requestAsyncSetting = res.objx || {};
-            this.showCodeEditor = true;
+            this.pushData = res.objx || {};
           }
         });
-      } else {
-        this.showCodeEditor = true;
       }
-    },
-    saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
-        if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + (this.isEdit ? `/request_async_setting/update` : `/request_async_setting/save`);
-            this.$http({
-              url: url,
-              method: `post`,
-              data: this.requestAsyncSetting,
-              isLoading: true,
-              success: res => {
-                this.$message({
-                  message: res.content,
-                  type: 'success',
-                  duration: 500,
-                  onClose: t => {
-                    if (this.isEdit) {
-                      this.$baseReload();
-                    } else {
-                      this.$baseReload({
-                        updateParam: {
-                          _dataId: res.objx,
-                          copyId: null
-                        }
-                      });
-                    }
-                  }
-                });
-              }
-            });
-          });
-        }
-      });
     }
   }
 };