modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java

@@ -135,8 +135,9 @@
            data.setId(circulatOrderid);
            ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
            data.setCirculatOrder(itemCirculatOrder);

            projectId = itemCirculatOrder.getProjectId();
            if (projectId==null){
                projectId = itemCirculatOrder.getProjectId();
            }

            data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderid));


 web/packages/components/zt-dict/src/zt-dict.vue

@@ -3,8 +3,8 @@
      <el-select :value="dictValue" @change="changeProjectMajor" @input="$emit('input', $event)" :placeholder="placeholder" clearable style="width: 100%;" v-if="showType === 'select'" :disabled="disabled">
          <el-option :label="data.dictLabel" v-for="data in dicts" :key="data.dictValue" :value ="data.dictValue">{{data.dictLabel}}</el-option>
      </el-select>
      <div v-if="showType === 'radio'" :disabled="disabled">
        <el-radio-group :value="dictValue" @input="$emit('input', $event)">
      <div v-if="showType === 'radio'">
        <el-radio-group :value="dictValue" @input="$emit('input', $event)" :disabled="disabled">
          <el-radio :label="data.dictValue" v-for="data in dicts" :key="data.dictValue">{{data.dictLabel}}</el-radio>
          <el-input class="radio-input" v-if="isOtherOptionSelected" v-model="inputName"></el-input>
        </el-radio-group>

 web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue

@@ -1,5 +1,5 @@
<template>
  <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
  <zt-dialog ref="dialog" column="3" @confirm="formSubmit">
    <el-form ref="dataForm" style="padding-top: 0" :inline="true" :disabled="dataForm.disabled" :model="dataForm" label-width="120px" class="warehouseFormAuto">
      <div >
        <el-form-item label-width="60px" label="编号:" style="width:100%;margin-bottom: -5px">
@@ -93,11 +93,16 @@
              <el-table-column prop="examineItem" min-width="300" label="检查项"></el-table-column>
              <el-table-column label="检查结果" width="250" align="center">
                <template slot-scope="scope">
                  <zt-dict v-model="scope.row.examineResult" placeholder="检查结果" dict="tristate2" :radio="true"
                  <zt-dict :disabled="!$store.state.user.isAdmin" v-model="scope.row.examineResult" placeholder="检查结果" dict="tristate2" :radio="true"
                           clearable></zt-dict>
                </template>
              </el-table-column>
              <el-table-column prop="notApplyExplan" align="center" width="120" label="不适用说明"></el-table-column>
              <el-table-column align="center" width="120" label="不适用说明">
                <template v-slot="{ row }">
                  <el-input v-if="$store.state.user.isAdmin" v-model="row.notApplyExplan" placeholder="不适用说明"></el-input>
                  <span v-else>{{row.notApplyExplan}}</span>
                </template>
              </el-table-column>
            </el-table>
            <div class="el-border-top">
            <el-form-item label="审核结果" style="width: 99%">

 web/src/views/modules/flowChart/ProcessTrajectory.vue

@@ -1,7 +1,5 @@
<!--流程轨迹-->
<template>
  <zt-dialog ref="dialog" :hasConfirm="false" title="流程办理轨迹" append-to-body
             @close="close">
    <el-table :data="tableData"  v-adaptive="{bottomOffset: 100}"
              height="250"
              v-loading="this.dataLoading">
@@ -10,7 +8,6 @@
      <el-table-column align="center" label="接受任务时间" prop="receiveTime"></el-table-column>
      <el-table-column align="center" label="完成时间" prop="finishTime"></el-table-column>
    </el-table>
  </zt-dialog>
</template>

<script>

 web/src/views/modules/flowChart/flowChartView.vue

@@ -200,8 +200,7 @@
        this.graph.positionContent('top',{ padding: { left: 0 }})
        // this.graph.zoomToFit()
        this.graph.freeze('flowChartView')
        if(flowCode!='planFlow' && flowCode!='wltFlow' && flowCode!='xbsy' && flowCode!='hxsy' && flowCode!='kybgFlow'
          && flowCode!='jsfaFlow' && flowCode!='jzjysFlow' && flowCode!='zjgcFlow'){
      /*  if(params.flowCode!='planFlow'){
          if(this.graph.scroller){
            for(let graph in this.graph.scroller.widgetOptions){
              this.graph.scroller.widgetOptions[graph] = false
@@ -209,7 +208,7 @@
          }
          // this.graph.disablePanning()
          this.graph.lockScroller()
        }
        }*/
      } else {
        this.graph.unfreeze('flowChartView')
        this.dataForm.id = null
@@ -224,7 +223,7 @@
      this.graph = new Graph({
        container: document.getElementById('flowChartView'),
        width: document.documentElement.clientWidth*0.5,
        height:this.flowChartHeight? 595:document.documentElement.clientHeight-220,
        height:400,
        // async: true,
        // grid: {
        //   visible: true,

 web/src/views/modules/flowChart/processTimeline.vue

@@ -3,7 +3,7 @@
    <el-col>
      <FlowChartView :flowChartHeight="flowChartHeight" ref="flowChartView"></FlowChartView>
    </el-col>
    <el-col>
    <el-col style="margin-top: 10px">
      <ProcessTrajectory ref="processTrajectory" @refreshDataList="getQuery()"></ProcessTrajectory>
    </el-col>
  </el-row>

 web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue

@@ -4,7 +4,7 @@
             label-width="120px" class="circulationFormAuto">
      <div>
        <el-form-item label-width="60px" label="编号:" style="width:100%;margin-bottom: -5px">
          <span>{{dataForm.circulatOrder.code}}</span>
          <span>{{dataForm.circulatOrder.code || '编号自动生成'}}</span>
        </el-form-item>
      </div>
      <div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
@@ -302,12 +302,17 @@
        return index += 1
      },
      init(id, row) {
        console.log(id,row,'流转单的')
        if (id) {
          this.dataForm.id = id
        } else {
          this.dataForm.id = row.id
        }
        this.dataForm.projectId = row.projectId
        if(row.projectId){
          this.dataForm.projectId =row.projectId
        } else {
          this.dataForm.projectId=row.bizGroupId
        }
        // this.dataForm.disabled
        this.getInfo()
        if (!this.dataForm.disabled) {
@@ -339,6 +344,18 @@
          ...this.dataForm,
          ...res.data
        }
        if(this.dataForm.project === null){
          this.dataForm.project={}
        }
        if(this.dataForm.circulatOrder === null){
          this.dataForm.circulatOrder={}
        }
        if(this.dataForm.testAgencyInfo === null){
          this.dataForm.testAgencyInfo={}
        }
        if(this.dataForm.flowInfoDto === null){
          this.dataForm.flowInfoDto={}
        }
        console.log(this.dataForm, "getInfo this.dataForm")
      },
      // 表单提交

 web/src/views/modules/sys/task/already-task.vue

@@ -186,7 +186,9 @@
        let row2 = cloneDeep(row)
        row2.stepMarker = null
        if (row.flowCode === 'wplz') {
          this.$refs.itemCirculatOrder.$refs.dialog.init(row2)
          this.$nextTick(()=>{
            this.$refs.itemCirculatOrder.$refs.dialog.init(row2.id,row2)
          })
        } else if (row.flowCode === 'aaa') {
          //this.$refs.itemCirculatOrder.$refs.dialog.init(row2)
        }