Merge remote-tracking branch 'origin/master'

zhaowei

2025-04-29 89a699602d78bb55c6ac70c5e9fd0306429d5e23

 src/views/flowable/workflow/FlowLedger.vue

@@ -11,7 +11,8 @@
        <a-row :gutter="24">
        <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-form-item label="流程分类">
            <j-dict-select-tag placeholder="请选择流程分类" v-model="queryParam.category" dictCode="flow_type"></j-dict-select-tag>
              <j-dict-select-tag placeholder="请选择流程分类" v-model="queryParam.category"
                                 dictCode="flow_type"></j-dict-select-tag>
          </a-form-item>
        </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -26,15 +27,17 @@
          </a-col>
        <a-col :xl="10" :lg="11" :md="12" :sm="24">
          <a-form-item label="操作时间">
            <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.startTime"></j-date>
              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust"
                      v-model="queryParam.startTime"></j-date>
            <span class="query-group-split-cust"></span>
            <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.endTime"></j-date>
              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust"
                      v-model="queryParam.endTime"></j-date>
          </a-form-item>
        </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a-button @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
            </span>
          </a-col>
        </a-row>
@@ -60,35 +63,9 @@
        class="j-table-force-nowrap"
        @change="handleTableChange">

        <!-- 字符串超长截取省略号显示-->
        <span slot="description" slot-scope="text">
          <j-ellipsis :value="text" :length="25" />
        </span>

        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>
        <template slot="imgSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)">
            下载
          </a-button>
        </template>

        <span slot="action" slot-scope="text, record">
            <a @click="handelDetial(record,text)">详情</a>
            <a @click="handelDetail(record,text)">详情</a>
        </span>

      </a-table>
    </div>

@@ -96,7 +73,7 @@

    <DispatchFileXq ref="modalFormDispatchFileXq"  :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>

    <InspectionOrderXq ref="modalFormInspectionOrderXq"  :selectShenpiData="selectInspectionOrderXqData"></InspectionOrderXq>
    <inspection-order-handle ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData"/>
  </a-card>
</template>

@@ -108,87 +85,85 @@
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue'
import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue'
import InspectionOrderXq from '@views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue'
import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue'

export default {
  name: 'NcDeviceCharactersList',
    name: 'FlowLedger',
  mixins:[JeecgListMixin, mixinDevice],
  components: {
    DispatchFileXq,
    AssignFileStreamXq: AssignFileStreamXq,
    JDictSelectTag,
    InspectionOrderXq
      InspectionOrderHandle,
      JDictSelectTag
  },
  data () {
    return {
      description: '设备特殊字符管理页面',
        description: '流程管理',
      // 表头
      columns: [
        {
          title: '序号',
          dataIndex: '',
          key:'rowIndex',
          align:"center",
            align: 'center',
          customRender:function (t,r,index) {
            return parseInt(index)+1;
              return parseInt(index) + 1
          }
        },
        {
          title: '流程分类',
          align: "center",
            align: 'center',
          dataIndex: 'category_dictText',
          width: 200,
            width: 200
        },
        {
          title:'流程名称',
          align:"center",
            align: 'center',
          dataIndex: 'flowName'
        },
        {
          title:'流程业务简要描述',
          align:"center",
            align: 'center',
          dataIndex: 'description',
          width: '30%',
          scopedSlots: {customRender: 'description'},
        },
        {
          title:'申请人',
          align:"center",
            align: 'center',
          dataIndex: 'proposer_dictText'
        },
        {
          title: '前驱节点',
          align: "center",
          dataIndex: 'preNode',
            align: 'center',
            dataIndex: 'preNode'
        },
        {
          title:'当前节点',
          align:"center",
            align: 'center',
          dataIndex: 'taskName'
        },
        {
          title:'流程开始时间',
          align:"center",
            align: 'center',
          dataIndex: 'startTime'
        },
        {
          title:'流程结束时间',
          align:"center",
            align: 'center',
          dataIndex: 'endTime'
        },
        {
          title:'处理时长',
          align:"center",
            align: 'center',
          dataIndex: 'duration'
        },
        {
          title:'当前任务人',
          align:"center",
            align: 'center',
          dataIndex: 'todoUsers_dictText'
        },
        {
          title:'处理过的人',
          align:"center",
            align: 'center',
          dataIndex: 'doneUsers_dictText'
        },
        {
@@ -201,7 +176,7 @@
        }
      ],
      url: {
        list: "/assign/flow/list",
          list: '/assign/flow/list'
      },
      dictOptions:{},
      selectShenpiData: {},
@@ -213,11 +188,11 @@
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    },
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
      }
  },
  methods: {
    handelDetial(item, index) {
      handelDetail(item, index) {
      console.log('点击了详情')
      console.log('item----->', item)
      console.log('index----->', index)
@@ -234,7 +209,7 @@
          break
        case 'sbdjApproval':
          item.description=item.title
          this.handInspectionOrderDetial(item)
            this.handInspectionOrderDetail(item)
          break
        default:
          alert('没找到该流程')
@@ -261,13 +236,15 @@
      this.$refs.modalFormDispatchFileXq.clearTableSource()
      this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
    },
    handInspectionOrderDetial(item){
      handInspectionOrderDetail(item) {
      this.selectInspectionOrderXqData = item
      this.selectInspectionOrderXqData.assignee_dictText=item.todoUsers_dictText
      this.selectInspectionOrderXqData.createTime=item.startTime
      this.selectInspectionOrderXqData.procInstId=item.processInstanceId
      this.$refs.modalFormInspectionOrderXq.clearTableSource()
        this.$refs.modalFormInspectionOrderXq.visible = true
        this.$refs.modalFormInspectionOrderXq.disableSubmit = true
      this.$refs.modalFormInspectionOrderXq.getAllApproveData(item)
        this.$refs.modalFormInspectionOrderXq.getBasicInformation(item)
    }
  }
}