From 9f0a808481d5326e6be3726123b2053450189b77 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 16:34:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0\=E5=B8=83=E5=B1=80=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   4 +
 jero-web/src/common/lang/zh-cn.js             |   4 +
 .../components/initiatingProcess.vue          |   2 +
 .../documentComparison/index.vue              | 340 ++++++++++++++++++
 4 files changed, 350 insertions(+)
 create mode 100644 jero-web/src/views/documentTools/documentComparison/index.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 05b8babf8..d8636703c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1138,4 +1138,8 @@ module.exports = {
   processName:'Process Name',
   feedbackResults:'Feedback results',
   theDoesNotSupportPreview:'The current file format does not support Preview',
+  releaseSituation:'Release situation',
+  comparisonResults:'Comparison results',
+  Published:'Published',
+  initiateComparison:'Initiate comparison',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c2d881205..15bbd4c33 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1142,4 +1142,8 @@ module.exports = {
   processName:'流程名称',
   feedbackResults:'反馈结果',
   theDoesNotSupportPreview:'当前文件格式不支持预览',
+  releaseSituation:'发布情况',
+  comparisonResults:'对比结果',
+  Published:'已发布',
+  initiateComparison:'发起对比',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 662cbdcf2..e5d051ce9 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -474,12 +474,14 @@
           query = {
             type: 6,
             ...value,
+            firstInitiation:"1",
             msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'')
           }
         } else {
           query = {
             type: 6,
             ...value,
+            firstInitiation:"1",
             msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'')
           }
         }
diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue
new file mode 100644
index 000000000..034141af2
--- /dev/null
+++ b/jero-web/src/views/documentTools/documentComparison/index.vue
@@ -0,0 +1,340 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('releaseSituation')">
+                <span>{{$t('releaseSituation')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowStatus">
+                <a-select-option v-for="(item, key) in gatherResultList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiateComparison')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
+           <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
+           <a class="text-operation"
+              @click="subscribe(record)">
+            {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
+           </a>
+          <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
+          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {},
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '',
+          deleteBatch:'',
+        },
+        loading: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        queryParam: {},
+        gatherResultList: [
+          {
+            value: '1',
+            name: this.$t('draft')
+          },
+          {
+            value: '2',
+            name: this.$t('Published')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard') + 1,
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title') + 1,
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatus'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileName'
+          },
+          {
+            title: this.$t('standard') + 2,
+            align: 'center',
+            dataIndex: 'serialNumberTwo',
+            width: 170
+          },
+          {
+            title: this.$t('title') + 2,
+            align: 'center',
+            dataIndex: 'titleTwo',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatusTwo'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileNameTwo'
+          },
+          {
+            title: this.$t('releaseSituation'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'releaseSituation'
+          },
+          {
+            title: this.$t('remarks'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'remark'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      comparisonResultsClick() {
+
+      },
+      subscribe() {
+
+      },
+      edit(){
+
+      },
+      initiatingProcessClick(){
+
+      },
+      deleteData(val){
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>
\ No newline at end of file