commit

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 => {

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=""
@@ -256,6 +261,7 @@ export default {
       sarProStatePageSize: this.$store.getters.userInfo.configContent,
       sarProStateListDatas: [], // 符合性项目列表数据
       sarProStateTableHeight: null, // 符合性项目列表高度
+      standId: '' // 符合性项目Id
     }
   },
   methods: {
@@ -290,12 +296,28 @@ export default {
           this.queryStandAndLaws()
       }, // 外层清空条件查询
       handleProjectCompliance (row) {
-          this.showSarProStateModal = true
+        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.sarProStateTotalPage = 1
         this.querySarProStateZero()
       }, // 清空条件查询
       clearSearchPro () {

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=""
@@ -203,7 +214,8 @@ name: "technologyInvolveProject",
           sarProject: {
               standName: '', // 标准政策名称
               standNumber: '', // 标准/政策号
-        standApplicationType: 2
+              standApplicationType: 2,
+              position: '1'
           }, // 条件查询
           sarProjectListDatas: [], // table数据
           countryOptions: [], //国家选择下拉框数据