田源
2023-12-12 a4e0b8f640d739b17724b2e648196741b42631b8
流程管理更改状态
已修改6个文件
75 ■■■■ 文件已修改
Source/UBCS-WEB/src/components/Master/MasterTree.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/file/main.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/MasterData/items.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/flow/manager.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -3,7 +3,9 @@
    <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
               :option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
      <template slot-scope="{ node }">
        <span id="labelSize" v-html="node.label" ></span>
        <el-tooltip class="item" effect="dark"  open-delay="350" :content="$createElement('div', { domProps: { innerHTML: node.label } })"  placement="right-start">
          <span id="labelSize" v-html="node.label" ></span>
        </el-tooltip>
      </template>
    </avue-tree>
    <div style="position: absolute; right: 3px; top: -1px;">
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -77,17 +77,6 @@
                                 :width="item.width"
                                 align="center">
                </el-table-column>
                <!--               参照数据-->
<!--                <el-table-column v-for="(item,index) in referArray"-->
<!--                                 v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"-->
<!--                                 :key="index"-->
<!--                                 :label="item.title" :show-overflow-tooltip="true"-->
<!--                                 :sortable="item.sortable" :width="item.width" align="center"-->
<!--                                 :prop="item.prop">-->
<!--                  <template slot-scope="scope">-->
<!--                    <span>{{ scope.row[item.showField] }}</span>-->
<!--                  </template>-->
<!--                </el-table-column>-->
              </el-table>
            </div>
          </el-row>
@@ -342,7 +331,7 @@
        datetime: "datetime",
      },
      tableData: [],
      tableHeight: 'calc(100vh - 350px)',
      tableHeight: 'calc(100vh - 300px)',
      DataVisible: false,
      tableHeadData: [],
      items: {},
@@ -356,15 +345,7 @@
      },
      // 主数据按钮
      masterVrBtnList: [],
      fileOptions: {
        ownbizOid: "0",
        ownbizBtm: "0",
        fileDocClassify: '!=processAuditSuggest',
        fileDocClassifyName: '',
        hasDownload: true,
        hasUpload: true,
        height: 110
      },
      fileOptions:{},
      result: '',
      elapsedTime: '',
    };
@@ -416,6 +397,15 @@
        this.tableData = newval;
        this.searchResults = newval
        this.doLayout();
        this.fileOptions= {
          ownbizOid: "0",
          ownbizBtm: "0",
          fileDocClassify: '!=processAuditSuggest',
          fileDocClassifyName: '',
          hasDownload: true,
          hasUpload: true,
          height: 'auto'
        }
      },
    },
    tableHeadFindData: {
@@ -523,7 +513,7 @@
        this.tableHeight = 'calc(100vh - 630px)';
        this.$refs.dataTable.doLayout()
      } else {
        this.tableHeight = 'calc(100vh - 350px)';
        this.tableHeight = 'calc(100vh - 310px)';
        this.$refs.dataTable.doLayout()
      }
    },
@@ -1139,7 +1129,7 @@
.top {
  overflow-y: scroll;
  min-height: 55%;
  min-height: 40%;
}
.bottom {
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -2069,16 +2069,23 @@
      const regex = new RegExp(this.rulesData.ruleRowBds);
      if (regex.test(this.RulesForm.TestContent)) {
        this.$message.success('校验成功')
      }else {
        this.$message.error('校验失败')
      }
    },
    //点击分类注入按钮
    injectBtn() {
      if (this.attrSelectList.length > 1) {
        this.$message.warning('只能选择一条模板数据')
      } else if (this.attrSelectList.length < 1) {
        return;
      }
      if (this.attrSelectList.length < 1) {
        this.$message.warning('请选择一条模板数据')
      } else if (this.attrSelectList.length === 1) {
        return;;
      }
      if (this.attrSelectList.length === 1) {
        this.injectVisible = true;
        return;
      }
    },
    //分类注入保存
Source/UBCS-WEB/src/components/file/main.vue
@@ -88,7 +88,7 @@
      hasDel:validatenull(this.options.hasDel) ? true :this.options.hasDel,
      hasDownload:validatenull(this.options.hasDownload) ? true :this.options.hasDownload,
      option: {
        height:(this.options.tableHeight?this.options.tableHeight:'400'),
        height:(this.options.tableHeight?this.options.tableHeight:'300'),
        calcHeight: 30,
        tip: false,
        searchShow: false,
Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -55,7 +55,7 @@
      page: {
        total: 0,
        currentPage: 1,
        pageSize: 100,
        pageSize: 10,
        pageSizes: [10, 30, 50, 100, 200],
      },
      pageSize: "100",
Source/UBCS-WEB/src/views/flow/manager.vue
@@ -26,7 +26,7 @@
                   size="small"
                   icon="el-icon-refresh"
                   v-if="permissionList.state"
                   @click.stop="handleState(scope.row,scope.index)">变更状态
                   @click.stop="handleDoState(scope.row,scope.index)">{{scope.row.suspensionState===1?'激活':'挂起'}}
        </el-button>
        <el-button type="text"
                   size="small"
@@ -292,15 +292,15 @@
        this.stateBox = true;
        this.selectionId = row.id;
      },
      handleDoState() {
        if (!this.flowState) {
          this.$message({
            type: "warn",
            message: "请先选择流程状态!"
          });
          return;
        }
        changeState({processId: this.selectionId, state: this.flowState}).then(res => {
      handleDoState(row) {
        // if (!this.flowState) {
        //   this.$message({
        //     type: "warn",
        //     message: "请先选择流程状态!"
        //   });
        //   return;
        // }
        changeState({processId: row.id, state: (row.suspensionState === 1 ? 'suspend' : 'active')}).then(res => {
          const data = res.data;
          if (data.success) {
            this.$message({