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

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/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -272,7 +272,21 @@
             ></el-button>
           </template>
         </el-table-column>
-
+<el-table-column
+          :label="i18nt('显示名称颜色')"
+          width="100"
+          prop="fixed"
+        >
+          <template #default="scope">
+            <el-select  v-model="scope.row.labelColor" clearable>
+              <el-option value="#e6a23c" label="橙"></el-option>
+              <el-option value="#2a6494" label="蓝"></el-option>
+              <el-option value="#30b08f" label="绿"></el-option>
+              <el-option value="#909399" label="灰"></el-option>
+              <el-option value="#ea5353" label="红"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作" width="150" fixed="right">
           <template slot="header">
@@ -967,7 +981,8 @@ export default {
         exportType: null,
         footerDataType: null,
         footerMethodConfg: null,
-        widgetList: []
+        widgetList: [],
+        labelColor:null
         // treeNode: false,
       };
       return row;

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -873,6 +873,30 @@ modules = {
       if (this.widget.options.hideGridCheckBox) {
         otherConfig.checkBoxRequired = false;
       }
+
+      //标题颜色
+      let headerCellStyle = null
+      let tableColumns = this.widget.options.tableColumns;
+      let colorMap = {}
+      let flag = 0
+      tableColumns.forEach(item=>{
+        if(item.labelColor){
+          flag = 1;
+          colorMap[item.columnId] = item.labelColor
+        }
+      })
+      if(flag){
+        headerCellStyle = (rowParam)=>{
+          let columnId = rowParam.column?.params?.columnId;
+          if(columnId){
+            let color = colorMap[rowParam.column.params.columnId]
+            if(color){
+              return `color:${color};`
+            }
+          }
+        }
+      }
+
       let tableOption = {
         // vue: this,
         tableRef: tableRef,
@@ -886,6 +910,7 @@ modules = {
           showFooter,
           pagerConfig,
           treeConfig,
+          headerCellStyle,
           ...editOpts,
           ...dataTableConfig.config,
           /*rowConfig:{

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

@@ -20,13 +20,35 @@
               <tr>
                 <th>{{ $t1('任务编码') }}</th>
                 <td>{{ pushData.taskCode }}</td>
-                <th>{{ $t1('服务名') }}</th>
-                <td>{{ pushData.serverName }}</td>
-                <th>{{ $t1('操作对象') }}</th>
-                <td>{{ pushData.code }}</td>
-                <th>{{ $t1('产生日志时间') }}</th>
-                <td>{{ pushData.operDate }}</td>
+                <th>{{ $t1('产生业务数据时间') }}</th>
+                <td>{{ pushData.generateDate }}</td>
+              </tr>
+              <tr>
+                <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>{{ $t1('备注') }}</th>
+                <td colspan="7">{{ pushData.remark }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1('真实数据') }}</th>
+                <td colspan="7">{{ pushData.data }}</td>
               </tr>
+              <tr>
+                <th>{{ $t1('别的服务传输数据过来的数据标识') }}</th>
+                <td colspan="7">{{ pushData.transfer }}</td>
+              </tr>
+
+              <tr>
+                <th>{{ $t1('数据唯一标识') }}</th>
+                <td colspan="7">{{ pushData.sid }}</td>
+              </tr>
+
               <tr>
                 <th>{{ $t1('冗余字段1') }}</th>
                 <td>{{ pushData.field1 }}</td>
@@ -47,10 +69,6 @@
                 <th>{{ $t1('创建时间') }}</th>
                 <td>{{ pushData.createDate }}</td>
               </tr>
-              <tr>
-                <th>{{ $t1('内容') }}</th>
-                <td colspan="7">{{ pushData.content }}</td>
-              </tr>
               </tbody>
             </table>
           </template>

package/src/views/bd/setting/push_data/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"
@@ -21,7 +21,7 @@
                 @submit="searchEvent" @reset="searchEvent">
         <vxe-form-item :title="$t1('服务名')+':'">
           <template v-slot>
-            <el-select v-model="formData.serverName">
+            <el-select v-model="serverName">
               <el-option v-for="(serviceId,index) in serviceIds" :key="index" :value="serviceId"
                          :label="serviceId"></el-option>
             </el-select>
@@ -37,6 +37,29 @@
             <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>
     </template>
   </vxe-grid>
@@ -47,9 +70,6 @@ import editView from './edit.vue';
 
 export default {
   name: 'push_data:list',
-  props: {
-    flag: String
-  },
   components: {editView},
   data() {
     return {
@@ -94,12 +114,6 @@ export default {
     openEditDialog(id) {
       this.dataId = !id || typeof id == 'object' ? 0 : id;
       this.$emit('openEditDialog', this.dataId);
-      /*if (this.flag !== 1) {
-        this.activeName = 'first';
-        this.$openEditView('showEdit');
-      } else {
-        this.$emit('openEditDialog', this.dataId);
-      }*/
     },
     initTableList() {
       let that = this;
@@ -123,114 +137,80 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '推送名称',
-            field: 'reqName',
+            title: '任务编码',
+            field: 'taskCode',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '推送编码',
-            field: 'reqCode',
-            width: 150,
-            fixed: 'left'
+            title: '产生业务数据时间',
+            field: 'generateDate',
+            width: 200,
           },
+
           {
-            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
           },
           {