From 818c3f4d5a7b71134eca837cf4f9cecf13f757e1 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 24 Aug 2021 13:40:42 +0800
Subject: [PATCH 1/2] feat: There is no way the

---
 .../components/EnterpriseStandardDatabase.vue | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 2d783eefe..d2758415a 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1066,7 +1066,7 @@
                       class="common-button-primary"
                       icon="el-icon-check"
                       type="primary"
-                      @click="getDomesticStandardTableBtn(sarBussionessSearch)">搜索
+                      @click="getBussionStandTableBtn(sarBussionessSearch,'','sel')">搜索
               </el-button>
               <el-button
                       class="common-button-default"
@@ -3262,11 +3262,11 @@ export default {
       this.exportModelFlag = false
     },
     // 搜索
-    getBussionStandTableBtn (item, advancedSearch) {
+    getBussionStandTableBtn (item, advancedSearch,type) {
       item.page = 1
       this.tableFlag = item
-      item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
-      this.getBussionStandTable(item)
+      // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
+      this.getBussionStandTable(item,'',type)
     },
     // 清空搜索框
     clearAllSearch (flag) {
@@ -3357,7 +3357,7 @@ export default {
       })
     },
     // 分页查询企业标准---表格
-    getBussionStandTable (item, nodeId) {
+    getBussionStandTable (item, nodeId,type) {
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -3390,6 +3390,25 @@ export default {
         this.sarBussionessSearch.collectMenuId = undefined
       }
         this.sarBussionessSearch.userId = this.$store.getters.userInfo.userId
+        if(type === 'sel'){
+            const advanceSearchVOList = [];
+            if(this.formFieldListData !== undefined && this.formFieldListData !== null){
+                const formFieldList = this.formFieldListData
+                formFieldList.forEach((item) => {
+                    const value = this.sarBussionessSearch[item.attrField]
+                    // 时间格式处理
+                    if (value !== undefined && value !== null && value !== '') {
+                        advanceSearchVOList.push({
+                            connect: advanceSearchVOList.length > 0 ? "and" : "",
+                            field: item.attrField || '',
+                            type: 'like',
+                            value: value
+                        })
+                    }
+                })
+            }
+            this.sarBussionessSearch.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+        }
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', !item ? this.sarBussionessSearch : item, {
         _this: this, loading: 'loading'
       }, res => {
@@ -3409,6 +3428,7 @@ export default {
         if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) {
           this.pageChange(1)
         }
+          this.isAdvancedSearch = false
       }, e => {
       })
       // this.$refs.selection.selectAll(false)
@@ -3685,22 +3705,7 @@ export default {
       const attrSearchMap = {
         applyArctic: formData.applyArctic
       }
-        formData['attrSearchStr'] = JSON.stringify(attrSearchMap)
-
-        const advanceSearchVOList = [];
-        const formFieldList = this.formFieldList
-        formFieldList.forEach((item) => {
-            const value = formData[item.attrField]
-            // 时间格式处理
-            if (value !== null && value !== '') {
-                advanceSearchVOList.push({
-                    field: item.attrField || '',
-                    type: 'like',
-                    value: value
-                })
-            }
-        })
-      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+      formData['attrSearchStr'] = JSON.stringify(attrSearchMap)
       this.SarExportSearchEo = item || this.sarBussionessSearch
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
@@ -3914,10 +3919,10 @@ export default {
       // this.classifyCodeOptions = res.data.STANDCLASSIFY
     }, e => {
     })
-    this.getBussionStandTable(this.tableFlag)
-    // this.getOrgTreeSource()
     // 加载动态表单数据
     this.getAddFormFieldList()
+    this.getBussionStandTable(this.tableFlag)
+    // this.getOrgTreeSource()
     this.tableHeight = $('.content').height() - 44 - 20
     window.onresize = () => {
       this.tableHeight = $('.content').height() - 44 - 20

From a9b107a81d4190b2d8fa233983e28039680e732f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 24 Aug 2021 14:06:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzjd/step1-6.vue       | 432 ++++++++++++++++++
 .../pages/processDetail/index.vue             |   2 +
 src/router/index.js                           |   9 +
 3 files changed, 443 insertions(+)
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
new file mode 100644
index 000000000..3fef3de73
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -0,0 +1,432 @@
+<template>
+  <div class="bzjdStep6">
+    <!--    标准调研流程-->
+    <ProcessHeader toggle>
+      <template slot="proName">标准解读流程</template>
+      <template slot="proNode">部长审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="overflow: auto;">
+        <el-form
+          ref="bzzqyjForm"
+          :model="form"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border">
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.itemsNum"
+                    placeholder="请输入标准编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.itemsName"
+                    placeholder="请输入标准名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                  <el-input
+                    disabled
+                    v-model="form.itemsNum1"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                  <el-input
+                    disabled
+                    v-model="form.itemsNum1"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                  <el-input
+                    disabled
+                    v-model="form.itemsName1"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                  <el-input
+                    disabled
+                    v-model="form.itemsName1"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </div>
+      <ProcessTitle>
+        <template slot="title">拆分信息</template>
+      </ProcessTitle>
+      <el-table border
+                ref="selection"
+                :data="itemList"
+                tooltip-effect="dark"
+                style="width: 100%;"
+                height="100%"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                row-key="id"
+      >
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column
+          prop="itemsNum"
+          label="条款号"
+          width="70"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          label="条款名称"
+          show-overflow-tooltip
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="itermsConditions"
+          label="条款内容"
+          width="200"
+          show-overflow-tooltip
+          align="center">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          width="150"
+          label="核心技术要求"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          v-if="sarType === 'INLAND'"
+          prop="changePoint"
+          width="150"
+          label="基于上一版本差异"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          v-if="sarType === 'FOREIGN'"
+          prop="changePoint"
+          width="150"
+          label="相对于国行标差异点"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="complianceRequir"
+          width="150"
+          label="符合项状态"
+          align="center">
+          <template slot-scope="scope">
+            <div v-if="scope.row.complianceRequir === '1'">符合</div>
+            <div v-else>不符合</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="complianceState"
+          width="150"
+          label="合规性分析"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="newData"
+          width="250"
+          label="新车型实施日期"
+          align="center">
+          <template slot-scope="scope">
+            <div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD')  : scope.row.newData }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="onlineData"
+          width="250"
+          label="在产车型实施日期"
+          align="center">
+          <template slot-scope="scope">
+            <div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD')  : scope.row.onlineData }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="applyArctic"
+          width="150"
+          label="适用车型"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="unitDeptName"
+          label="责任部门"
+          width="170"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          label="责任人"
+          width="170"
+          prop="zrUserIdName"
+          align="center">
+        </el-table-column>
+      </el-table>
+      <el-collapse accordion>
+        <el-collapse-item title="意见填写">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <el-table
+        height="100%"
+        ref="selection"
+        :data="histortData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        row-key="id"
+        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+        <el-table-column
+          prop="name"
+          label="任务步骤"
+          align="center"
+          sortable="custom"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="assignee"
+          label="任务受理人"
+          align="center"
+          sortable="custom"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          sortable="custom"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="endTime"
+          label="完成时间"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="comment"
+          label="审批意见"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.commentText }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="completeFlag"
+          label="状态"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-dialog
+      title="查看条款内容"
+      :visible.sync="itermsConditionsFlag"
+      size="800px">
+      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+      </div>
+    </el-dialog>
+    <loading :loading="loading">加载中...</loading>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from '../../components/ProcessHeader'
+import ProcessFooter from '../../components/ProcessFooter'
+import ProcessTitle from '../../components/ProcessTitle'
+import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+
+export default {
+  name: "bzjdStep1-6",
+  data() {
+    return {
+      itermsConditionsFlag: false,
+      itermsConditionsTitle: '',
+      histortData: [],
+      sarType: '',
+      itemList: [],
+      loading: true,
+      commentText: '',
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      textarea: '', // 意见
+      active: '1', // 默认显示
+      isSubmit: false,
+      saveLoading: false,
+      form: {
+        itemsNum: '',
+        itemsName: '',
+        itemsNum1: '',
+        itemsName1: '',
+      },
+      json: {},
+    }
+  },
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  methods: {
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.itermsConditionsFlag = true
+      this.itermsConditionsTitle = row
+    },
+    getHistoryData () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+      }, {}, res => {
+        this.histortData = res
+      }, e => {})
+    },
+    handleTabs(name) {
+      this.active = name
+    },
+    handleSave() {},
+    handleSubmitNo () {
+      if (this.commentText) {
+        this.isSubmit = true
+        var json = this.json
+        json.gcApplyFlag = 2
+        json.commentText = this.commentText
+        this.$http.post('lawss/activiti/completeTask', {
+          json: JSON.stringify(json),
+          taskId: this.taskIds,
+          userId: this.$store.getters.userInfo.userId
+        }, {}, res => {
+          if (res.success) {
+            this.$message.success('驳回成功')
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        })
+      } else {
+        this.$message.warning('请输入反馈意见')
+      }
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          let data = JSON.parse(res.mesg)
+          this.form.itemsNum = data.itemsNum || data.form.itemsNum
+          this.form.itemsName = data.itemsName || data.form.itemsName
+          this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+          this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+          this.sarType = data.standInData || data.sarType
+          this.json = data
+          this.itemList = data.itemList
+          this.loading = false
+        }).catch(e => {
+        })
+      })
+    },
+  },
+  mounted () {
+    this.getHistoryData()
+    this.getData()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzjdStep6 {
+  /deep/.el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+  .fileClass {
+    cursor: pointer;
+  }
+  .fileClass:hover{
+    color: #0c91e5;
+  }
+  position: relative;
+  height: 100%;
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index f7be9ed8a..2f8411f01 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -219,6 +219,8 @@ export default {
           }else{
             this.toProcessDetail('xmpg2Step1-2',row)
           }
+        }else if(prcType === '9'){
+          this.toProcessDetail('bzjdStep1-6',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')
diff --git a/src/router/index.js b/src/router/index.js
index c01c0ef07..cb6fc9cd6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -862,6 +862,15 @@ const routes = [
           title: '标准解读流程'
         }
       },
+      {
+        path: '/bzjdStep1-6',
+        name: 'bzjdStep1-6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
     ]
   },
   // 本地工具