commit

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -6,93 +6,22 @@ export default {
   mixins: [],
   components: {},
   data () {
-    return {
+      return {
-      processTypeList: [
+          processTypeList: [
-        {
+              {
-          label: '法规入库及评估流程',
+                  label: '标准入库流程',
-          value: '1'
+                  value: '1'
-        }, {
+              },
-          label: '标准法规技术储备评估流程',
+          ],
-          value: '2'
+          formDisableFlag: false,
-        },
+          pickerOptions: {
-        {
+              disabledDate(time) {
-          label: '项目评估流程',
+                  const start = new Date(new Date().toLocaleDateString());
-          value: '3'
+                  start.setTime(start.getTime());
-        },
+                  return time.getTime() < start
-        {
+              }
-          label: '企标制修订流程',
+          }
-          value: '4'
-        },
-        {
-          label: '未符合项跟踪流程',
-          value: '5'
-        },
-        {
-          label: '企标制修订申请流程',
-          value: '6'
-        },
-        {
-          label: '企标废止流程',
-          value: '7'
-        },
-        {
-          label: '企标延期制修订申请流程',
-          value: '8'
-        },
-        {
-          label: '标准采购流程',
-          value: '9'
-        },
-        {
-          label: '工作组会前申请流程',
-          value: '10'
-        },
-        {
-          label: '企标制修订评估流程',
-          value: '11'
-        },
-        {
-          label: '企标勘误流程',
-          value: '12'
-        },
-        {
-          label: '行政管理要求评估流程',
-          value: '13'
-        },
-        {
-          label: '政策入库及评估流程',
-          value: '14'
-        },
-        {
-          label: '标准翻译申请流程',
-          value: '15'
-        },
-        {
-          label: '工作组会后管理流程',
-          value: '16'
-        },
-        {
-          label: '企标备案流程',
-          value: '17'
-        },
-        {
-          label: '标准法规清单发布/更新流程',
-          value: '18'
-        },
-        {
-          label: '企标复审流程',
-          value: '19'
-        }
-      ],
-      formDisableFlag: false,
-      pickerOptions: {
-        disabledDate(time) {
-          const start = new Date(new Date().toLocaleDateString());
-          start.setTime(start.getTime());
-          return time.getTime() < start
-        }
       }
-    }
   },
   methods: {
     /**

src/pages/processCenter/pages/newProcess/index.vue

@@ -4,8 +4,8 @@
     <div v-if="bzfggllc">
       <el-divider content-position="left"><h2>标准法规管理流程</h2></el-divider>
       <div class="process-box">
-        <div class="process-name" @click="handleCreateProcess('1')">标准调研流程</div>
+        <div class="process-name" @click="handleCreateProcess('2')">标准调研流程</div>
-        <div class="process-name" @click="handleCreateProcess('2')">标准入库流程</div>
+        <div class="process-name" @click="handleCreateProcess('1')">标准入库流程</div>
         <div class="process-name" @click="handleCreateProcess('3')">标准征求意见流程</div>
         <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>
         <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>
@@ -46,13 +46,13 @@ export default {
       this.$store.commit('setDetailMap', this.$route.path)
       this.$store.commit('setHandleInfo')
       switch (prcType) {
-        case '1':
+        case '2':
           // 标准调研流程
           this.$router.push({
             name: 'bzdyStep1'
           })
           break
-        case '2':
+        case '1':
           // 标准入库流程
           this.$router.push({
             name: 'bzrkStep1'

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -82,6 +82,9 @@
             align="center"
             width="180"
           >
+            <template slot-scope="scope">
+              <span>{{ getPrcName(scope.row.prcType) }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="prcName"
@@ -179,7 +182,24 @@ export default {
       this.queryProcess()
     },
     queryProcess () { // 查询待办流程
+      this.$http.postData('lawss/activiti/todoTaskList', {
+                current: this.pageNo,
+                size: parseInt(this.$store.getters.userInfo.configContent),
+                userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
+                prcName: this.searchForm.prcName,
+                prcType: parseInt(this.searchForm.prcType) || '',
+                prcNum: this.searchForm.prcNum
+              },
+              {
+                loading: 'loading',
+                _this: this
+              }, res => {
+                this.processList = res.list
+                this.total = res.count
+              }, e => {
+              })
     },
+
     selectProcessBtn () { // 搜索按钮
       this.pageNo = 1
       this.queryProcess()

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -142,57 +142,57 @@
                 align="center">
             </el-table-column>
             <el-table-column
-                prop="carModel"
+                prop="productLineId"
                 label="产品线">
             </el-table-column>
             <el-table-column
-                prop="carModel"
+                prop="standNumber"
                 label="项目编号">
             </el-table-column>
             <el-table-column
-                    prop="carModel"
+                    prop="productName"
                     label="项目名称">
             </el-table-column>
             <el-table-column
-                    prop="carModel"
+                    prop="standNumber"
                     label="标准编号">
             </el-table-column>
             <el-table-column
-                    prop="carModel"
+                    prop="standName"
                     label="标准名称">
             </el-table-column>
             <el-table-column
-                    prop="carModel"
+                    prop="standardItem"
-                    label="标准章节">
+                    label="标准章条">
             </el-table-column>
             <el-table-column
-                    prop="carModel"
+                    prop="standardInfo"
                     label="标准主要内容">
             </el-table-column>
             <el-table-column
-                    align="center"
+                    align="productType"
                     label="在研产品">
               <el-table-column
-                      prop=""
+                      prop="researchImplementationTime"
                       label="实施时间">
               </el-table-column>
               <el-table-column
-                      prop=""
+                      prop="researchCompliance"
                       label="合规">
               </el-table-column>
               <el-table-column
-                      align="center"
+                      align="researchNonCompliance"
                       label="不合规">
                 <el-table-column
-                        prop=""
+                        prop="researchNonCompliance"
                         label="不合规项目">
                 </el-table-column>
                 <el-table-column
-                        prop=""
+                        prop="researchCountermeasures"
                         label="应对措施">
                 </el-table-column>
                 <el-table-column
-                        prop=""
+                        prop="researchCompletionTime"
                         label="完成时间">
                 </el-table-column>
               </el-table-column>
@@ -201,22 +201,22 @@
                     align="center"
                     label="在产产品">
               <el-table-column
-                      prop=""
+                      prop="productionImplementationTime"
                       label="实施时间">
               </el-table-column>
               <el-table-column
-                      prop=""
+                      prop="productionCompliance"
                       label="合规(具体情况)">
               </el-table-column>
               <el-table-column
                       align="center"
                       label="不合规">
                 <el-table-column
-                        prop=""
+                        prop="productionCountermeasures"
                         label="应对措施">
                 </el-table-column>
                 <el-table-column
-                        prop=""
+                        prop="productionCompletionTime"
                         label="完成时间">
                 </el-table-column>
               </el-table-column>

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -148,26 +148,25 @@
                 align="center">
             </el-table-column>
             <el-table-column
-                    prop="productName"
+                    prop="standNumber"
                     label="标准编号">
-
             </el-table-column>
             <el-table-column
-                    prop="carModel"
+                    prop="standName"
                     label="标准名称">
             </el-table-column>
             <el-table-column
-                    v-if="SarProStateType === 'INLAND'"
+                    v-if="sarProject.position === '1'"
-                    prop="productName"
+                    prop="lastVersionNumber"
                     label="上一版本标准编号">
             </el-table-column>
             <el-table-column
-                    v-if="SarProStateType !== 'INLAND'"
+                    v-if="sarProject.position === '2'"
-                    prop="productName"
+                    prop="correspondDomesticStandard"
                     label="对应国行标">
             </el-table-column>
             <el-table-column
-                prop="productName"
+                prop="specificItem"
                 label="具体章条">
             </el-table-column>
             <el-table-column
@@ -175,17 +174,17 @@
                 align="center"
                 label="解读内容">
               <el-table-column
-                      prop="carModel"
+                      prop="coreTechnicalRequirement"
                       label="核心技术要求(简述、请勿抄写标准)">
               </el-table-column>
               <el-table-column
-                      v-if="SarProStateType === 'INLAND'"
+                      v-if="sarProject.position === '1'"
-                      prop="carModel"
+                      prop="comparedWithPrevious"
                       label="相对于上一版本变化点">
               </el-table-column>
               <el-table-column
-                      v-if="SarProStateType !== 'INLAND'"
+                      v-if="sarProject.position === '2'"
-                      prop="carModel"
+                      prop="comparedDomesticStandard"
                       label="相对于国行标差异点">
               </el-table-column>
               <el-table-column
@@ -209,31 +208,32 @@
 export default {
 name: "technologyInvolveProject",
   data () {
-      return {
+    return {
-          SarProStateType: '', // 国内外
+      SarProStateType: '', // 国内外
-          sarProject: {
+      sarProject: {
-              standName: '', // 标准政策名称
+        standName: '', // 标准政策名称
-              standNumber: '', // 标准/政策号
+        standNumber: '', // 标准/政策号
-              standApplicationType: 2,
+        standApplicationType: 2,
-              position: '1'
+        position: '1'
-          }, // 条件查询
+      }, // 条件查询
-          sarProjectListDatas: [], // table数据
+      sarProjectListDatas: [], // table数据
-          countryOptions: [], //国家选择下拉框数据
+      countryOptions: [], //国家选择下拉框数据
-          tableHeight: null, // table高度
+      tableHeight: null, // table高度
-          loading: false,
+      loading: false,
-          total: 0,
+      total: 0,
-          page: 1,
+      page: 1,
-          pageSize: this.$store.getters.userInfo.configContent,
+      pageSize: this.$store.getters.userInfo.configContent,
-          showSarProStateModal: false,
+      showSarProStateModal: false,
-          sarProStateEO: {
+      sarProStateEO: {
-              productName: ''
+        productName: ''
-          },
+      },
-          sarProStateTotal: 0,
+      sarProStateTotal: 0,
-          sarProStateTotalPage: 1,
+      sarProStateTotalPage: 1,
-          sarProStatePageSize: this.$store.getters.userInfo.configContent,
+      sarProStatePageSize: this.$store.getters.userInfo.configContent,
-          sarProStateListDatas: [], // 符合性项目列表数据
+      sarProStateListDatas: [], // 符合性项目列表数据
-          sarProStateTableHeight: null,
+      sarProStateTableHeight: null,
-      }
+      standId: '', // 符合性项目id
+    }
   },
   methods: {
       searchStandAndLaws () {
@@ -267,10 +267,26 @@ name: "technologyInvolveProject",
           this.queryStandAndLaws()
       }, // 外层清空条件查询
       handleProjectCompliance (row) {
-          this.showSarProStateModal = true
+        this.standId = row.standId
-          this.querySarProStateZero()
+        this.querySarProStateZero()
       }, // 查看项目符合性
-      querySarProStateZero () {}, // 查询项目数据
+    querySarProStateZero () {
+      var form = this.sarProStateEO
+      form.position = this.sarProject.position
+      form.standId = this.standId
+      form.current = this.sarProStateTotalPage
+      form.size = this.sarProStatePageSize
+      this.$http.get('sarStandardComplianceAssessResult/interpretation', 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()