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

src/pages/details/complianceDetails/index.vue

@@ -1,10 +1,9 @@
 <!--符合性详情-->
 <template>
   <div id="complianceDetails">
-    <!--不满足-->
-    <el-divider content-position="left" v-if="unfit.length">不满足</el-divider>
+    <!-- v-if="unfit.length"不满足-->
+    <el-divider content-position="left"  >不满足</el-divider>
     <el-table
-        v-if="unfit.length"
         ref="selection"
         :data="unfit"
         tooltip-effect="dark"
@@ -13,65 +12,57 @@
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
       <el-table-column
-          prop="sarNumber"
-          label="标准号/条款号"
+          prop="standNumber"
+          label="标准号"
           align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="nonConfomity"
-          label="不满足内容"
+        prop="itemsNumber"
+        label="条款号"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="评估人"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="评估时间"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+          prop=""
+          label="不合规项目"
           align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="current"
-          label="我司现状"
+          prop=""
+          label="应对措施"
           align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="changeScheme"
-          label="更改方案"
+          prop=""
+          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-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="check.length">待验证</el-divider>
@@ -151,41 +142,45 @@
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
       <el-table-column
-          prop="sarNumber"
-          label="标准号/条款号"
-          align="center"
+        prop="standNumber"
+        label="标准号"
+        align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="justified"
-          label="符合理由"
-          align="center"
+        prop="itemsNumber"
+        label="条款号"
+        align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="compPersonName"
-          label="评估人员"
-          align="center"
-          width="100px"
+        prop=""
+        label="评估人"
+        align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="compTime"
-          label="评估时间"
-          align="center"
-          width="100px"
+        prop=""
+        label="评估时间"
+        align="center"
       >
       </el-table-column>
       <el-table-column
-          prop="prcNum"
-          label="流程"
+          prop=""
+          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-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="notInvolve.length">不涉及</el-divider>

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

@@ -488,7 +488,8 @@ export default {
         statusId: '',
         itemsNum1: '',
         itemsName1: '',
-        oldNumber: ''
+        oldNumber: '',
+        fileType: '',
       },
       formRules: {
         itemsNum: [
@@ -722,6 +723,7 @@ export default {
         this.standId = bringData[0].standId
         this.statusId = bringData[0].id
         this.form.statusId = bringData[0].id
+        this.form.fileType = bringData[0].fileType
         this.listModel = false;
         this.listModel2 = true
         this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {

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

@@ -554,6 +554,7 @@
                                             :drawerTitle="drawerTitle"
                                             :show-checkBox="showCheckBox"
                                             :url="url"
+                                            :type="'car'"
                                             :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
                                             :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
@@ -570,6 +571,7 @@
                                             :drawerTitle="drawerTitle"
                                             :show-checkBox="showCheckBox"
                                             :url="url"
+                                            :type="'truck'"
                                             :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
                                             :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"  @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -791,6 +791,7 @@
                           :modalShowFlag="modalShowFlag2"
                           :drawerTitle="drawerTitle"
                           :url="url"
+                          :type="'car'"
                           :urlChild="urlChild"
                           :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
                           :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"  @popoverHideCancel="popoverHideBusVsCancel" ></tree-select-new>
@@ -805,6 +806,7 @@
                           :modalShowFlag="modalShowFlag3"
                           :drawerTitle="drawerTitle"
                           :url="url"
+                          :type="'truck'"
                           :urlChild="urlChild"
                           :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
                           :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>

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

@@ -25,6 +25,22 @@
         >
           <el-row :gutter="24">
             <el-col :span="24">
+              <el-form-item label="分解单来源" class="add-form-item form-item-disabled">
+                <el-select
+                  @change="fileTypeChange"
+                  v-model="listForm.fileType"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in decomposeOptions"
+                    :value="item.attrField"
+                    :key="item.id"
+                    :label="item.attrName"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
                 <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择已拆分标准</el-button>
               </el-form-item>
@@ -522,7 +538,7 @@ export default {
       // 查询相关参数
       searching: false,
       commentText:'',
-      fileType:  'FBGBJBD',
+      fileType:  '',
       standardSearch: {
         standType: "",
         standName: ""
@@ -531,6 +547,7 @@ export default {
         productLine: '',
         uname: '',
       },
+      decomposeOptions: [], //分解单来源数据
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -717,7 +734,12 @@ export default {
       this.standardSearch.standType = type;
     },
     choiceShow() {
-      this.ListModel = true;
+      if(!this.fileType){
+        this.$message.warning('请先选择分解单来源')
+      }else{
+        this.getStandData();
+        this.ListModel = true;
+      }
     },
     drawerCheck(data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -913,7 +935,7 @@ export default {
         this.listForm.id = this.selectedList[0].id;
         this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
           ids: this.listForm.id,
-          type: "FBGBJBD"
+          type: this.fileType
         }, {
           _this: this
         }, res => {
@@ -1002,6 +1024,9 @@ export default {
       this.page = 1;
       this.getStandData();
     },
+    fileTypeChange(type){
+      this.fileType = type
+    },
     //获取标准数据
     getStandData() {
       this.$http.post("SarStandItems/sar-stand-items/findStand", {
@@ -1050,10 +1075,19 @@ export default {
       this.standStateOptions = res.data.WBZTCLASS; // 文本状态
       this.setMap(this.standStateOptions);
     });
+    //查找分解单来源数据
+    this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
+      _this: this
+    }, res => {
+      res.data.forEach(item => {
+        if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
+          this.decomposeOptions.push(item)
+        }
+      })
+    })
     this.getData();
     this.getTree();
     this.getProductData();
-    this.getStandData();
   }
 
 };

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

@@ -25,6 +25,22 @@
         >
           <el-row :gutter="24">
             <el-col :span="24">
+              <el-form-item label="分解单来源" class="add-form-item form-item-disabled">
+                <el-select
+                  @change="fileTypeChange"
+                  v-model="listForm.fileType"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in decomposeOptions"
+                    :value="item.attrField"
+                    :key="item.id"
+                    :label="item.attrName"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
                 <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择已拆分标准</el-button>
               </el-form-item>
@@ -261,6 +277,7 @@
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
+        <loading :loading="tableLoading">数据获取中</loading>
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
             <div class="left">
@@ -500,6 +517,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: "xmpgStep1",
@@ -516,6 +534,7 @@ export default {
       satisfyFlag: true,
       active: "1",
       standModel: false,
+      tableLoading: false,
       sarAccessListDatas: [],
       productData: [], //添加抽屉的数据
       standList: [], //新添加的标准
@@ -524,7 +543,7 @@ export default {
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
-      fileType: "FBGBJBD",
+      fileType: "",
       projectSearch: {
         productLine: '',
         uname: '',
@@ -533,6 +552,7 @@ export default {
         standType: "",
         standName: ""
       },
+      decomposeOptions: [], //分解单数据
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -710,7 +730,13 @@ export default {
       this.standardSearch.standType = type;
     },
     choiceShow() {
-      this.ListModel = true;
+      if(!this.fileType){
+        this.$message.warning('请先选择分解单来源')
+      }else{
+        this.getStandData();
+        this.ListModel = true;
+      }
+
     },
     drawerCheck(data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -906,7 +932,7 @@ export default {
         this.listForm.id = this.selectedList[0].id;
         this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
           ids: this.listForm.id,
-          type: "FBGBJBD"
+          type: this.fileType
         }, {
           _this: this
         }, res => {
@@ -999,8 +1025,12 @@ export default {
       this.page = 1;
       this.getStandData();
     },
+    fileTypeChange(type){
+      this.fileType = type
+    },
     //获取标准数据
     getStandData() {
+      this.tableLoading = true
       this.$http.post("SarStandItems/sar-stand-items/findStand", {
         page: this.page,
         size: this.pageSize,
@@ -1011,6 +1041,7 @@ export default {
       }, res => {
         this.sarAccessListDatas = res.records;
         this.total = res.total;
+        this.tableLoading = false
       }, e => {
 
       });
@@ -1047,9 +1078,18 @@ export default {
       this.standStateOptions = res.data.WBZTCLASS; // 文本状态
       this.setMap(this.standStateOptions);
     });
+    //查找分解单来源数据
+    this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
+      _this: this
+    }, res => {
+      res.data.forEach(item => {
+        if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
+          this.decomposeOptions.push(item)
+        }
+      })
+    })
     this.getTree();
     this.getProductData();
-    this.getStandData();
   }
 
 };

src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue

@@ -18,7 +18,7 @@
         <translate-cost v-if="activeName === 'translateCost'"></translate-cost>
       </el-tab-pane>
       <el-tab-pane label="标准制修订补助资金收支统计" name="subsidyCost">
-        <society-cost v-if="activeName === 'subsidyCost'"></society-cost>
+        <subsidy-cost v-if="activeName === 'subsidyCost'"></subsidy-cost>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -47,9 +47,6 @@ export default {
       activeName: 'societyCost',
     }
   },
-  mounted() {
-    console.log(5)
-  },
   methods: {
     doubleClick(tab) {
     }

src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue

@@ -3,7 +3,7 @@
   <div id="societyCost" class="child1">
     <!-- 第一第二行表单 -->
     <el-form :inline="true" :model="formQuery" class="demo-form-inline">
-      <el-form-item class="add-form-item" label="协会名称/标委会:">
+      <el-form-item class="add-form-item" label="协会名称:">
         <el-input v-model="formQuery.scName" size="small" placeholder="请输入协会名称-标委会"></el-input>
       </el-form-item>
       <el-form-item class="add-form-item" label="费用列支:">

src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue

@@ -1,12 +1,12 @@
 <!--标法规-工作组-项目费用统计信息-标准制修订补助资金收支统计-->
 <template>
   <div id="subsidyCost" class="subsidy-Cost">
-    <el-tabs v-model="activeName" @tab-click="TreblingClick">
+    <el-tabs v-model="tabsName" @tab-click="TreblingClick">
       <el-tab-pane label="收入表" name="inComeSubsidy">
-        <in-come-subsidy v-if="activeName === 'inComeSubsidy'"></in-come-subsidy>
+        <in-come-subsidy v-if="tabsName === 'inComeSubsidy'"></in-come-subsidy>
       </el-tab-pane>
       <el-tab-pane label="支出表" name="expendSubsidy">
-        <expend-subsidy v-if="activeName === 'expendSubsidy'"></expend-subsidy>
+        <expend-subsidy v-if="tabsName === 'expendSubsidy'"></expend-subsidy>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -24,7 +24,7 @@ export default {
   },
   data(){
     return {
-      activeName: 'inComeSubsidy',
+      tabsName: 'inComeSubsidy',
     }
   },
   mounted() {

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

@@ -84,7 +84,7 @@
             label="标准号"
             fixed="left"
             show-overflow-tooltip
-            width="120px"
+            width="190px"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standSortShow === undefined"
@@ -101,14 +101,12 @@
             prop="standName"
             label="中文名称"
             show-overflow-tooltip
-            width="120px"
           >
           </el-table-column>
           <el-table-column
             prop="standEnName"
             label="英文名称"
             show-overflow-tooltip
-            width="120px"
           >
           </el-table-column>
           <el-table-column
@@ -157,25 +155,9 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="kccvppsbm"
+            prop=""
             width="180px"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="cycvppscn"
-            width="180px"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            label="乘车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            label="乘车vpps中文名称">
+            label="合规评估结果">
           </el-table-column>
         </el-table>
         <pagination

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

@@ -48,7 +48,7 @@
         <el-table-column
           prop="standType"
           label="标准/政策类型"
-          width="120"
+          width="320"
         >
           <template slot-scope="scope">
             <div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
@@ -61,7 +61,7 @@
         <el-table-column
           prop="standNumber"
           label="标准/政策号"
-          width="180"
+          width="320"
         >
           <template slot-scope="scope">
             <a class="table-jump"
@@ -77,18 +77,13 @@
                @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="interpretationTime"
-          label="评估时间"
-        >
-        </el-table-column>
         <el-table-column
           fixed="right"
           label=""
-          width="50"
+          width="80"
           align="center">
           <template slot-scope="scope">
-            <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>
+            <el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -155,28 +150,40 @@
             :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
             <el-table-column
-              type="selection"
-              width="55"
+              type="index"
+              width="50"
               align="center">
             </el-table-column>
-<!--            <el-table-column-->
-<!--              width="150px"-->
-<!--              align="center"-->
-<!--              prop="productLineId"-->
-<!--              label="产品线">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              width="150px"-->
-<!--              align="center"-->
-<!--              prop="productId"-->
-<!--              label="项目编号">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              width="150px"-->
-<!--              align="center"-->
-<!--              prop="productName"-->
-<!--              label="项目名称">-->
-<!--            </el-table-column>-->
+            <el-table-column
+              width="150px"
+              align="center"
+              prop="projectNumber"
+              label="项目编号">
+            </el-table-column>
+            <el-table-column
+              width="150px"
+              align="center"
+              prop="projectName"
+              label="项目名称">
+            </el-table-column>
+            <el-table-column
+              width="110px"
+              align="center"
+              prop="projectGroup"
+              label="项目群">
+            </el-table-column>
+            <el-table-column
+              width="110px"
+              align="center"
+              prop="productLine"
+              label="产品线">
+            </el-table-column>
+            <el-table-column
+              width="110px"
+              align="center"
+              prop="uname"
+              label="产品线责任人">
+            </el-table-column>
             <el-table-column
               width="150px"
               align="center"
@@ -201,98 +208,20 @@
               prop="clauseName"
               label="条款名称">
             </el-table-column>
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              prop="productType"-->
-<!--              label="在研产品">-->
-              <el-table-column
-                width="150px"
-                align="center"
-                prop="researchImplementationTime"
-                label="实施时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                width="150px"
-                align="center"
-                prop="researchCompliance"
-                label="合规">
-              </el-table-column>
-              <el-table-column
-                width="150px"
-                align="center"
-                label="不合规">
-                <el-table-column
-                  width="150px"
-                  align="center"
-                  prop="researchNonCompliance"
-                  label="不合规项目">
-                </el-table-column>
-                <el-table-column
-                  width="150px"
-                  align="center"
-                  prop="researchCountermeasures"
-                  label="应对措施">
-                </el-table-column>
-                <el-table-column
-                  width="150px"
-                  align="center"
-                  prop="researchCompletionTime"
-                  label="完成时间">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.researchCompletionTime ? $moment(scope.row.researchCompletionTime).format('YYYY-MM-DD') : '' }}</span>
-                  </template>
-                </el-table-column>
-              </el-table-column>
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              prop="center"-->
-<!--              label="在产产品">-->
-<!--              <el-table-column-->
-<!--                width="150px"-->
-<!--                align="center"-->
-<!--                prop="productionImplementationTime"-->
-<!--                label="实施时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span>{{ scope.row.productionImplementationTime ? $moment(scope.row.productionImplementationTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                width="150px"-->
-<!--                align="center"-->
-<!--                prop="productionCompliance"-->
-<!--                label="合规(具体情况)">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                width="150px"-->
-<!--                align="center"-->
-<!--                label="不合规">-->
-<!--                <el-table-column-->
-<!--                        width="150px"-->
-<!--                        align="center"-->
-<!--                        prop="productionNonCompliance"-->
-<!--                        label="不合格项目">-->
-<!--                </el-table-column>-->
-<!--                <el-table-column-->
-<!--                  width="150px"-->
-<!--                  align="center"-->
-<!--                  prop="productionCountermeasures"-->
-<!--                  label="应对措施">-->
-<!--                </el-table-column>-->
-<!--                <el-table-column-->
-<!--                  width="150px"-->
-<!--                  align="center"-->
-<!--                  prop="productionCompletionTime"-->
-<!--                  label="完成时间">-->
-<!--                  <template slot-scope="scope">-->
-<!--                    <span>{{ scope.row.productionCompletionTime ? $moment(scope.row.productionCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
+            <el-table-column
+              width="150px"
+              align="center"
+              prop=""
+              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
             :page="sarProStateTotalPage"
@@ -339,6 +268,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')
+    },
     searchStandAndLaws() {
       this.page = 1;
       this.queryStandAndLaws();