From 41ef8fddfc68a3899318e75ebb118fa056b8f89c Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 18 Jun 2021 14:45:43 +0800
Subject: [PATCH] commit

---
 .../pages/creatProcess/bzrk/step1.vue         |  3 +
 .../pages/standInvolveProjectDetail.vue       | 76 ++++++++++++-------
 .../pages/technologyInvolveProject.vue        | 60 +++++++++------
 3 files changed, 88 insertions(+), 51 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index db3a54aa2..e423ff5f4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -740,6 +740,9 @@
             handleSave() {},
             handleSubmit() {
                 var json = this.form
+                json.zrUserId = this.$store.getters.userInfo.userId
+                json.jlUserId = this.$store.getters.userInfo.userId
+                json.applyUpdUserId = this.$store.getters.userInfo.userId
                 this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
                     _this: this
                 }, res => {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index 31c69b2b7..f9679d2da 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -68,6 +68,11 @@
             label="标准/政策名称"
         >
         </el-table-column>
+        <el-table-column
+                prop="interpretationTime"
+                label="评估时间"
+        >
+        </el-table-column>
         <el-table-column
             fixed="right"
             label=""
@@ -233,29 +238,30 @@ export default {
   name: 'standInvolveProjectDetail',
   data () {
     return {
-        sarProject: {
-          standName: '', // 标准政策名称
-          standNumber: '', // 标准/政策号
-          standApplicationType: 1
+      sarProject: {
+        standName: '', // 标准政策名称
+        standNumber: '', // 标准/政策号
+        standApplicationType: 1
       },  // 条件查询
-        showSarProStateModal: false, // 查看drawer开关
-        // table数据
-        sarProjectListDatas: [],
-        // table高度
-        tableHeight: null,
-        // 列表页loading
-        loading: false,
-        total: 0,
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
-        sarProStateEO: {
-            productName: ''
-        },
-        sarProStateTotal: 0,
-        sarProStateTotalPage: 1,
-        sarProStatePageSize: this.$store.getters.userInfo.configContent,
-        sarProStateListDatas: [], // 符合性项目列表数据
-        sarProStateTableHeight: null, // 符合性项目列表高度
+      showSarProStateModal: false, // 查看drawer开关
+      // table数据
+      sarProjectListDatas: [],
+      // table高度
+      tableHeight: null,
+      // 列表页loading
+      loading: false,
+      total: 0,
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      sarProStateEO: {
+        productName: ''
+      },
+      sarProStateTotal: 0,
+      sarProStateTotalPage: 1,
+      sarProStatePageSize: this.$store.getters.userInfo.configContent,
+      sarProStateListDatas: [], // 符合性项目列表数据
+      sarProStateTableHeight: null, // 符合性项目列表高度
+      standId: '' // 符合性项目Id
     }
   },
   methods: {
@@ -290,13 +296,29 @@ export default {
           this.queryStandAndLaws()
       }, // 外层清空条件查询
       handleProjectCompliance (row) {
-          this.showSarProStateModal = true
-          this.querySarProStateZero()
+        this.standId = row.standId
+        this.querySarProStateZero()
       }, // 查看项目符合性
-      querySarProStateZero () {}, // 查询项目数据
+      querySarProStateZero () {
+        var form = this.sarProStateEO
+        form.standId = this.standId
+        form.current = this.sarProStateTotalPage
+        form.size = this.sarProStatePageSize
+        this.$http.get('sarStandardComplianceAssessResult/product', form, {
+          _this: this,
+          loading: 'loading'
+        }, res => {
+          if (res.ok) {
+            this.sarProStateListDatas = res.data.records
+            this.sarProStateTotal = res.data.total
+          }
+        })
+        this.showSarProStateModal = true
+      }, // 查询项目数据
       clearSearchProState () {
-          this.sarProStateEO.productName = ''
-          this.querySarProStateZero()
+        this.sarProStateEO.productName = ''
+        this.sarProStateTotalPage = 1
+        this.querySarProStateZero()
       }, // 清空条件查询
       clearSearchPro () {
           this.sarProStateEO.productName = ''
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index 446877c09..6a9d684ba 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -14,6 +14,12 @@
                       placeholder="标准/政策名称查找"
                       clearable></el-input>
           </el-form-item>
+            <el-form-item label="类型" class="search-item search-item-last">
+                <el-select v-model="sarProject.position" placeholder="请选择标准性质">
+                    <el-option value="1" label="国内"></el-option>
+                    <el-option value="2" label="海外"></el-option>
+                </el-select>
+            </el-form-item>
           <el-form-item label="" class="search-item btn-box">
             <el-button class="common-button-primary" type="primary" icon="el-icon-search" size="mini" @click="searchStandAndLaws"></el-button>
           </el-form-item>
@@ -68,6 +74,11 @@
             label="标准/政策名称"
         >
         </el-table-column>
+        <el-table-column
+                prop="interpretationTime"
+                label="评估时间"
+        >
+        </el-table-column>
         <el-table-column
             fixed="right"
             label=""
@@ -198,30 +209,31 @@
 export default {
 name: "technologyInvolveProject",
   data () {
-    return {
-      SarProStateType: '', // 国内外
-      sarProject: {
-        standName: '', // 标准政策名称
-        standNumber: '', // 标准/政策号
-        standApplicationType: 2
-      }, // 条件查询
-      sarProjectListDatas: [], // table数据
-      countryOptions: [], //国家选择下拉框数据
-      tableHeight: null, // table高度
-      loading: false,
-      total: 0,
-      page: 1,
-      pageSize: this.$store.getters.userInfo.configContent,
-      showSarProStateModal: false,
-      sarProStateEO: {
-        productName: ''
-      },
-      sarProStateTotal: 0,
-      sarProStateTotalPage: 1,
-      sarProStatePageSize: this.$store.getters.userInfo.configContent,
-      sarProStateListDatas: [], // 符合性项目列表数据
-      sarProStateTableHeight: null,
-    }
+      return {
+          SarProStateType: '', // 国内外
+          sarProject: {
+              standName: '', // 标准政策名称
+              standNumber: '', // 标准/政策号
+              standApplicationType: 2,
+              position: '1'
+          }, // 条件查询
+          sarProjectListDatas: [], // table数据
+          countryOptions: [], //国家选择下拉框数据
+          tableHeight: null, // table高度
+          loading: false,
+          total: 0,
+          page: 1,
+          pageSize: this.$store.getters.userInfo.configContent,
+          showSarProStateModal: false,
+          sarProStateEO: {
+              productName: ''
+          },
+          sarProStateTotal: 0,
+          sarProStateTotalPage: 1,
+          sarProStatePageSize: this.$store.getters.userInfo.configContent,
+          sarProStateListDatas: [], // 符合性项目列表数据
+          sarProStateTableHeight: null,
+      }
   },
   methods: {
       searchStandAndLaws () {