Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -242,7 +242,7 @@
        datetime: "datetime",
      },
      tableData: [],
      tableHeight: 'calc(100vh - 330px)',
      tableHeight: 'calc(100vh - 350px)',
      DataVisible: false,
      tableHeadData: [],
      items: {},
@@ -770,6 +770,7 @@
      this.addvisible = false;
      addSaveCode(val).then(res => {
        this.$nextTick(() => {
          this.$message.warning("保存成功");
          this.onLoad()
        })
      })
@@ -779,6 +780,7 @@
      this.editvisible = false;
      editSaveCode(val).then(res => {
        this.$nextTick(() => {
          this.$message.warning("保存成功");
          this.onLoad()
        })
      })
@@ -792,6 +794,7 @@
      upSaveCode(val).then(res => {
        console.log(res)
        this.$nextTick(() => {
          this.$message.warning("保存成功");
          this.onLoad()
        })
      })

 Source/UBCS-WEB/src/components/flow-design/main.vue

@@ -8,13 +8,13 @@
               width="70%"
               custom-class="flow-design-dialog">
      <wf-design-base ref="bpmn"
                      style="height: 60vh;"
                      style="height: 60vh;width:100%"
                      :options="option"></wf-design-base>
    </el-dialog>
    <div v-else>
      <wf-design-base v-if="visible"
                      ref="bpmn"
                      style="height: 60vh;"
                      style="height: 50vh;width:100%"
                      :options="option"></wf-design-base>
    </div>
  </div>

 Source/UBCS-WEB/src/components/work/BusinessWork.vue

@@ -104,24 +104,26 @@
  },
  methods:{
    HandlerSave(){
      this.editingRow = null;
      //保存
      let datas=this.tableData.map(item=> {
        let newitem = {
          codeClassifyOid: item.codeclsfid,
          templateOid: this.templateId,
          editInProcess: true,
          data: item,
          oid:item.oid,
          ts:item.ts
        }
        return newitem;
      })
      batchUpdateCode(datas).then(res => {
        if(res.data.data.success){
          this.$message.success("修改成功");
        }
      })
      if(!validatenull(this.editingRow)) {
        this.editingRow = null;
        //保存
        let datas = this.tableData.map(item => {
          let newitem = {
            codeClassifyOid: item.codeclsfid,
            templateOid: this.templateId,
            editInProcess: true,
            data: item,
            oid: item.oid,
            ts: item.ts
          }
          return newitem;
        })
        batchUpdateCode(datas).then(res => {
          if (res.data.data.success) {
            this.$message.success("修改成功");
          }
        })
      }
    },
    //表格头渲染
    CrudHeaderRend() {

 Source/UBCS-WEB/src/views/work/process/leave/handle.vue

@@ -10,14 +10,9 @@
            <el-tab-pane label="流程跟踪" name="second">
              <avue-crud :data="flowList" :option="option" ref="crud">
              </avue-crud>
              <el-card shadow="hover">
                <div slot="header">
                  <span>流程跟踪</span>
                </div>
                <el-row class="row-bg">
                  <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
                </el-row>
              </el-card>
              <el-row class="row-bg" style="margin-top: 20px">
                <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
              </el-row>
            </el-tab-pane>
          </el-tabs>
        </el-card>
@@ -233,4 +228,11 @@
::v-deep(.el-upload-dragger .el-icon-upload) {
  margin: 15px 0 16px;
}
.el-tab-pane{
  height: 75vh;
  overflow: auto;
}
.el-button{
  margin:0 10px 10px 0;
}
</style>