Merge remote-tracking branch 'origin/develop' into develop

src/pages/details/complianceDetails/index.vue

@@ -64,72 +64,6 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
     </el-table>
-    <!--待验证-->
-    <el-divider content-position="left"  v-if="check.length">待验证</el-divider>
-    <el-table
-        v-if="check.length"
-        ref="selection"
-        :data="check"
-        tooltip-effect="dark"
-        border
-        style="width: 100%; min-height: 300px; margin-bottom: 30px;"
-        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-        fontWeight: 'bold', height: '48px'}">
-      <el-table-column
-          prop="sarNumber"
-          label="标准号/条款号"
-          align="center"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="riskPoint"
-          label="风险点"
-          align="center"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="verificationScheme"
-          label="验证方案"
-          align="center"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="estimatedChangeCycle"
-          label="预估更改周期"
-          align="center"
-      >
-      </el-table-column>
-<!--      <el-table-column-->
-<!--          prop="estimatedCost"-->
-<!--          label="预估成本"-->
-<!--          align="center"-->
-<!--      >-->
-<!--      </el-table-column>-->
-      <el-table-column
-          prop="compPersonName"
-          label="评估人员"
-          align="center"
-          width="100px"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="compTime"
-          label="评估时间"
-          align="center"
-          width="100px"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="prcNum"
-          label="流程"
-          align="center"
-          width="170px"
-      >
-        <template slot-scope="scope">
-          <span class="table-jump" @click="processCenterClick(scope.row)">{{ scope.row.prcNum }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
     <!--满足-->
     <el-divider content-position="left" v-if="fit.length">满足</el-divider>
     <el-table
@@ -182,48 +116,6 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
     </el-table>
-    <!--不涉及-->
-    <el-divider content-position="left" v-if="notInvolve.length">不涉及</el-divider>
-    <el-table
-        ref="selection"
-        v-if="notInvolve.length"
-        :data="notInvolve"
-        tooltip-effect="dark"
-        border
-        style="width: 100%; min-height: 300px; margin-bottom: 30px;"
-        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-        fontWeight: 'bold', height: '48px'}">
-      <el-table-column
-          prop="sarNumber"
-          label="标准号/条款号"
-          align="center"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="compPersonName"
-          label="评估人员"
-          align="center"
-          width="100px"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="compTime"
-          label="评估时间"
-          align="center"
-          width="100px"
-      >
-      </el-table-column>
-      <el-table-column
-          prop="prcNum"
-          label="流程"
-          align="center"
-          width="170px"
-      >
-        <template slot-scope="scope">
-          <span class="table-jump" @click="processCenterClick(scope.row)">{{ scope.row.prcNum }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
     <loading :loading="loading">加载中...</loading>
   </div>
 </template>
@@ -233,9 +125,7 @@ export default {
   data () {
     return {
       loading: false,
-      check: [], // 待验证
       fit: [], // 满足
-      notInvolve: [], // 不涉及
       unfit: [] // 不满足
     }
   },
@@ -253,9 +143,7 @@ export default {
           loading: 'loading'
         }, res => {
           if (res.ok) {
-            this.check = res.data.check
             this.fit = res.data.fit
-            this.notInvolve = res.data.notInvolve
             this.unfit = res.data.unfit
           } else {
             this.$message.warning(res.message)
@@ -270,9 +158,7 @@ export default {
           loading: 'loading'
         }, res => {
           if (res.ok) {
-            this.check = res.data.check
             this.fit = res.data.fit
-            this.notInvolve = res.data.notInvolve
             this.unfit = res.data.unfit
           } else {
             this.$message.warning(res.message)

src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue

@@ -63,7 +63,6 @@
           </el-table-column>
           <el-table-column
             align="center"
-            width="200px"
             label="标准号"
           >
             <template slot-scope="scope">
@@ -77,7 +76,6 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -87,12 +85,33 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="分解单来源"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <el-select
+                @change="fileTypeChange"
+                v-model="scope.row.fileType"
+                placeholder="请选择"
+                filterable
+              >
+                <el-option
+                  v-for="item in decomposeOptions"
+                  :value="item.attrField"
+                  :key="item.id"
+                  :label="item.attrName"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="ssrq"
             width="190px"
@@ -129,32 +148,6 @@
             width="180px"
           >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
-            align="center"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
-            align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -369,6 +362,8 @@ export default {
       isSubmit: false,
       saveLoading: false,
       commentText: "",
+      fileType: '',
+      decomposeOptions: [], //分解单数据
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
@@ -432,6 +427,22 @@ export default {
     };
   },
   methods: {
+    fileTypeChange(type){
+      this.fileType = type
+      let ids = [];
+      let fileTypes = []
+      this.dataList.forEach(item => {
+        ids.push(item.standId);
+        fileTypes.push(item.fileType)
+      });
+      this.standId = ids.join(",");
+      this.fileType = fileTypes.join(",")
+      if(fileTypes.includes('')){
+        return
+      }else{
+        this.getClauseData()
+      }
+    },
     // 表格勾选
     handleSelectionChange(selection, val) {
       if (selection.length > 1) {
@@ -527,14 +538,13 @@ export default {
           ids.push(item.standId);
         });
         this.standId = ids.join(",");
-        this.getClauseData();
       });
     },
     //查询标准下的条款
     getClauseData() {
-      this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
+      this.$http.get("SarStandItems/sar-stand-items/workflowFindItems", {
           ids: this.standId,
-          type: "FBGBJBD"
+          type: this.fileType
         },
         {
           _this: this
@@ -591,6 +601,15 @@ export default {
     },
     //流程提交事件
     handleSubmit() {
+      let fileFlag
+      this.dataList.forEach(item => {
+        if(!item.fileType){
+          fileFlag = false
+        }
+      })
+      if(!fileFlag){
+        this.$message.warning('请选择分解单来源')
+      }
       if (this.listForm.dataList.length < 1) {
         this.$message.warning("请选择带标准的项目");
       } else {
@@ -654,6 +673,22 @@ export default {
     }
   },
   mounted() {
+    //查找分解单来源数据
+    this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
+      _this: this
+    }, res => {
+      this.decomposeOptions.push(
+        {
+          attrField: 'BDR',
+          attrName: '不带入'
+        }
+      )
+      res.data.forEach(item => {
+        if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
+          this.decomposeOptions.push(item)
+        }
+      })
+    })
     this.getData();
     this.getProjectData();
   }

src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue

@@ -57,7 +57,6 @@
           </el-table-column>
           <el-table-column
             align="center"
-            width="200px"
             label="标准号"
           >
             <template slot-scope="scope">
@@ -69,7 +68,6 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -79,7 +77,6 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -121,32 +118,6 @@
             width="180px"
           >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
-            align="center"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
-            align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
-          </el-table-column>
         </el-table>
       </div>
       <div>

src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue

@@ -73,7 +73,6 @@
           </el-table-column>
           <el-table-column
             align="center"
-            width="200px"
             label="标准号"
           >
             <template slot-scope="scope">
@@ -87,7 +86,6 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -97,12 +95,33 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="分解单来源"
+            align="center"
+          >
+              <template slot-scope="scope">
+                <el-select
+                  @change="fileTypeChange"
+                  v-model="scope.row.fileType"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in decomposeOptions"
+                    :value="item.attrField"
+                    :key="item.id"
+                    :label="item.attrName"
+                  >
+                  </el-option>
+                </el-select>
+              </template>
+          </el-table-column>
           <el-table-column
             prop="ssrq"
             width="190px"
@@ -139,32 +158,6 @@
             width="180px"
           >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
-            align="center"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
-            align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -365,6 +358,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { saveTaskFirst } from "api/process";
+import file from "@/pages/knowledgeGraph/components/file";
 
 export default {
   name: "xmpg2Step1",
@@ -378,6 +372,8 @@ export default {
       active: "1",  //当前选中的type
       isSubmit: false,
       saveLoading: false,
+      fileType: '',
+      decomposeOptions: [], //分解单来源数据
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
@@ -447,6 +443,22 @@ export default {
     };
   },
   methods: {
+    fileTypeChange(type){
+      this.fileType = type
+      let ids = [];
+      let fileTypes = []
+      this.dataList.forEach(item => {
+        ids.push(item.standId);
+        fileTypes.push(item.fileType)
+      });
+      this.standId = ids.join(",");
+      this.fileType = fileTypes.join(",")
+      if(fileTypes.includes('')){
+        return
+      }else{
+        this.getClauseData()
+      }
+    },
     // 表格勾选
     handleSelectionChange(selection, val) {
       if (selection.length > 1) {
@@ -532,6 +544,9 @@ export default {
         })
         this.listForm.dataList = res.data.records;
         this.dataList = res.data.records;
+        this.dataList.forEach(item => {
+            this.$set(item,'fileType', '')
+        })
         this.listForm.dataList.forEach(item => {
           // 责任部门转换
           if (item.zrbm !== null || item.zrbm !== "") {
@@ -551,14 +566,13 @@ export default {
           ids.push(item.standId);
         });
         this.standId = ids.join(",");
-        this.getClauseData();
       });
     },
     //查询标准下的条款
     getClauseData() {
-      this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
+      this.$http.get("SarStandItems/sar-stand-items/workflowFindItems", {
           ids: this.standId,
-          type: "FBGBJBD"
+          types: this.fileType
         },
         {
           _this: this
@@ -604,6 +618,15 @@ export default {
     },
     //流程提交事件
     handleSubmit() {
+      let fileFlag
+        this.dataList.forEach(item => {
+          if(!item.fileType){
+            fileFlag = false
+          }
+        })
+      if(!fileFlag){
+         this.$message.warning('请选择分解单来源')
+      }
       if (this.listForm.dataList.length < 1) {
         this.$message.warning("请选择带标准的项目");
       } else {
@@ -687,6 +710,22 @@ export default {
       this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
     }, e => {
     });
+    //查找分解单来源数据
+    this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
+      _this: this
+    }, res => {
+      this.decomposeOptions.push(
+        {
+          attrField: 'BDR',
+          attrName: '不带入'
+        }
+      )
+      res.data.forEach(item => {
+        if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
+          this.decomposeOptions.push(item)
+        }
+      })
+    })
   }
 };
 </script>

src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue

@@ -57,7 +57,6 @@
           </el-table-column>
           <el-table-column
             align="center"
-            width="200px"
             label="标准号"
           >
             <template slot-scope="scope">
@@ -69,7 +68,6 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -79,7 +77,6 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -121,32 +118,6 @@
             width="180px"
           >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
-            align="center"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
-            align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
-          </el-table-column>
         </el-table>
       </div>
       <div>

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -157,7 +157,15 @@
             show-overflow-tooltip
             prop=""
             width="180px"
-            label="合规评估结果">
+            label="合规性情况">
+            <template slot-scope="scope">
+              <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
+              <div class="table-jump" @click="changeState(scope.row)">
+                <div v-if="scope.row.sarState === 1">符合</div>
+                <div v-if="scope.row.sarState === 2">不符合</div>
+                <div v-if="scope.row.sarState === 3"></div>
+              </div>
+            </template>
           </el-table-column>
         </el-table>
         <pagination
@@ -510,6 +518,19 @@ export default {
     }
   },
   methods: {
+    changeState (row) {
+      console.log(row);
+      let routeUrl = this.$router.resolve({
+        name: 'ComplianceDetails',
+        query: {
+          sarId: this.saveSarId,
+          productId: row.productId,
+          sarType: row.standType,
+          fromPage: 'product'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     //搜索清单
     searchSarAccess() {
       this.pageDo = 1