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

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

@@ -14,7 +14,8 @@
             <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
             <el-col :span="5" :push="2">项目名称: <span class="valueColor">{{ localProEO.projectName }}</span></el-col>
             <!--          <el-col :span="5" :push="2">车型系列:<span class="valueColor">{{ localProEO.productSet }}</span></el-col>-->
-            <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span></el-col>
+            <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
+            </el-col>
           </el-row>
           <el-row style="margin-top: 10px">
             <el-col :span="5">项目状态: <span class="valueColor">{{ localProEO.projectStatus }} </span></el-col>
@@ -24,20 +25,24 @@
           </el-row>
           <el-row style="margin-top: 10px">
             <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.projectManager }} </span></el-col>
-            <el-col :span="5" :push="1"> 项目计划开始时间: <span class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD')}}</span></el-col>
+            <el-col :span="5" :push="1"> 项目计划开始时间: <span
-            <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
+                class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
+            <el-col :span="5" :push="2">项目计划完成时间: <span
+                class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
           </el-row>
         </div>
       </el-card>
       <div class="action-bar">
         <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="addList">调取</el-button>
-        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除</el-button>
+        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除
+        </el-button>
         <el-button class="common-button-default export-button"
                    size="mini" @click="exportStandard"
                    v-btn-permission="''"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                    icon="export"
-        >导出</el-button>
+        >导出
+        </el-button>
       </div>
       <!--      <el-tabs type="border-card">-->
       <!--        <el-tab-pane :label="localProEO.productName" class="details-panel-tabs-item">-->
@@ -65,7 +70,10 @@
               width="260px"
           >
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.standSort+ ' ' + scope.row.standNumber + '-' + scope.row.standYear}}</span>
+              <span
+                  style="margin-left: 10px">{{
+                  scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -86,7 +94,9 @@
               sortable
               label="标准实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-' }}</span>
+              <span style="margin-left: 10px">{{
+                  scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-'
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -94,7 +104,9 @@
               width="190px"
               label="新车型实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-' }}</span>
+              <span style="margin-left: 10px">{{
+                  scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-'
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -103,7 +115,9 @@
               width="190px"
               label="在产车实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-' }}</span>
+              <span style="margin-left: 10px">{{
+                  scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-'
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -171,7 +185,8 @@
                     </el-formItem>
                     <el-formItem label="标准类别" prop="standSort" class="search-item">
                       <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
-                        <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
+                        <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value"
+                                   :key="opt.value" :label="opt.label">{{ opt.label }}
                         </el-option>
                       </el-select>
                     </el-formItem>
@@ -187,11 +202,13 @@
                           size="mini"
                           class="common-button-primary"
 
-                        @click="search">查询</el-button>
+                          @click="search">查询
+                      </el-button>
                       <el-button
                           class="common-button-default"
                           size="mini"
-                        @click="clearSearch">清空</el-button>
+                          @click="clearSearch">清空
+                      </el-button>
                     </el-formItem>
                   </el-form>
                 </div>
@@ -218,7 +235,8 @@
                   label="标准号">
                 <template slot-scope="scope">
                   <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                      scope.row.standNumber
                     }}-{{ scope.row.standYear }}</a>
                   <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
                     {{ scope.row.standNumber }}</a>
@@ -238,7 +256,9 @@
                   label="新车型实施日期">
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">
-                    {{scope.row.attrInfoCaseMap.xcxssrq ? $moment(scope.row.attrInfoCaseMap.xcxssrq).format('YYYY-MM-DD') : '-'}}
+                    {{
+                      scope.row.attrInfoCaseMap.xcxssrq ? $moment(scope.row.attrInfoCaseMap.xcxssrq).format('YYYY-MM-DD') : '-'
+                    }}
                   </span>
                 </template>
               </el-table-column>
@@ -248,7 +268,9 @@
                   label="在产车实施日期">
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">
-                    {{scope.row.attrInfoCaseMap.zccssrq ? $moment(scope.row.attrInfoCaseMap.zccssrq).format('YYYY-MM-DD') : '-'}}
+                    {{
+                      scope.row.attrInfoCaseMap.zccssrq ? $moment(scope.row.attrInfoCaseMap.zccssrq).format('YYYY-MM-DD') : '-'
+                    }}
                   </span>
                 </template>
               </el-table-column>
@@ -285,7 +307,8 @@
       <div slot="footer">
         <el-button class="common-button-primary" icon="el-icon-check" type="primary"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
-                   @click="exportTestItem">导出</el-button>
+                   @click="exportTestItem">导出
+        </el-button>
         <el-button class="common-button-default" icon="el-icon-close" @click="cancal">取消</el-button>
       </div>
     </el-dialog>
@@ -295,6 +318,7 @@
 import {mapGetters} from 'vuex'
 import LawsTreeView from '@/components/ProjectRelatedPersonnel/view'
 import {interfaceUrl} from "@/sysConfig";
+
 export default {
   name: 'Details',
   components: {
@@ -308,6 +332,8 @@ export default {
         standNumber: '',
         standType: ''
       },
+      //用来存放项目id
+      proId: '',
       size: this.$store.getters.userInfo.configContent,
       pageSizeNo: this.$store.getters.userInfo.configContent,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -416,9 +442,14 @@ export default {
           for (let i = 0; i < this.selectList.length; i++) {
             this.selectList1.push(this.selectList[i].standId)
           }
-          this.id=this.selectList1.join(',')
+          let deleteTagList = []
+          this.selectList1.forEach(item => {
+            //项目id-标准id,项目id-标准id
+            deleteTagList.push( this.proId + '-' + item )
+          })
+          this.id = deleteTagList.join(',')
           this.$http.post('sarStandProjectLibrary/deleteByIds', {
-            id:this.id
+            id: this.id,
           }, {
             _this: this,
             loading: 'loading'
@@ -556,7 +587,9 @@ export default {
       this.$store.commit('setDetailMap', '')
     },
     showLocalProductData(item) {
+      console.log(item)
       this.localProEO = JSON.parse(JSON.stringify(item))
+      this.proId = this.localProEO.id
       // 查询详情表格数据
       this.$http.get('sarStandProjectLibrary/queryStandInfo', {
         id: this.localProEO.id
@@ -590,7 +623,8 @@ export default {
       })
       this.selectTableDataList()
     },
-    resetTakeingForm() {},
+    resetTakeingForm() {
+    },
     //导出
     exportStandard() {
       if (this.selectList.length > 0) {
@@ -642,9 +676,12 @@ export default {
       }
       this.exportModelFlag = false
     },
-    exportProducdata() {},
+    exportProducdata() {
-    deleteStandLawsForProduct() {},
+    },
-    selectStandLawsForProduct() {},
+    deleteStandLawsForProduct() {
+    },
+    selectStandLawsForProduct() {
+    },
     pageChangeLaws(page) {
       this.page = page
       this.getDataList()
@@ -700,17 +737,21 @@ export default {
     width: 20px;
     height: 20px;
   }
+
   .iconClass {
     width: 18px;
     height: 18px;
   }
+
   .iconClassDia {
     width: 30px;
     height: 30px;
   }
+
   .picBorder {
     border: 1px solid #409eff;
   }
+
   .add-border {
     /*width: 80px;*/
     height: 80px;
@@ -719,6 +760,7 @@ export default {
     align-items: center;
     cursor: pointer
   }
+
   .laws-details-header {
     background: #fff;
     // height: 30px;
@@ -729,6 +771,7 @@ export default {
       display: inline-block;
       margin-right: 10px;
     }
+
     .title {
       display: inline-block;
       font-weight: bold;
@@ -738,39 +781,49 @@ export default {
       text-align: center;
     }
   }
+
   .contaiiner {
     height: calc(~'100% - 55px');
     background: #fff;
     padding: 5px 10px;
+
     .el-card__body {
       .el-row {
         line-height: 1.5;
         font-size: 14px;
       }
     }
+
     .details-panel-tabs-item {
       height: 100%;
+
       .table-wrapper {
         height: 100%;
       }
     }
   }
+
   .pagination {
     position: unset;
   }
+
   .el-steps.el-steps--simple {
     padding: 13px;
   }
+
   .el-step.is-simple {
     flex-basis: auto;
     width: 269px;
   }
+
   .valueColor {
     color: #999;
   }
+
   .el-steps.el-steps--horizontal {
     margin-left: 30px;
   }
+
   @media screen and (min-width: 1920px) {
     /deep/ .el-step__main {
       position: relative;
@@ -792,18 +845,22 @@ export default {
       text-align: center;
     }
   }
+
   /deep/ .el-step__icon {
     width: 18px;
     height: 18px;
     font-size: 12px;
   }
+
   /deep/ .el-step__title {
     font-size: 12px;
   }
 }
+
 /deep/ .el-drawer__body {
   position: relative;
 }
+
 .wx-drawer-content {
   position: absolute;
   top: 0;
@@ -812,6 +869,7 @@ export default {
   right: 0;
   height: unset !important;
 }
+
 /deep/ .relateClass {
   & > button {
     height: 30px;
@@ -820,6 +878,7 @@ export default {
     padding: 0 10px;
     font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
   }
+
   & i {
     display: inline-block;
     margin-right: 3px;
@@ -830,37 +889,46 @@ export default {
     background-position: center center;
     vertical-align: text-bottom;
   }
+
   .relation-btn {
     color: #409EFF;
     border: 1px solid #409EFF;
     background: rgba(64, 158, 255, 0.1);
+
     .icon-relation {
       background-image: url("~assets/images/shangqi/standardDetails/relation.png");
     }
   }
 }
+
 ::v-deep .el-drawer__header {
   & > span:first-child {
     outline: none !important;
   }
 }
+
 ::v-deep .el-drawer {
   outline: none !important;
 }
+
 /deep/ .leftTable {
   .el-table th > .cell {
     font-size: 11px;
   }
+
   .el-table th {
     padding: 0;
   }
+
   .el-table__body-wrapper {
     height: 44px;
   }
 }
+
 /deep/ .el-tabs__content {
   padding-bottom: 0;
 }
+
 /deep/ .el-card__body {
   padding: 0;
 }
@@ -868,15 +936,18 @@ export default {
 <style lang="less">
 .localProductDetails {
   height: 100%;
+
   .el-tabs__content {
     min-height: 412px;
   }
 }
+
 .leftTable {
   .el-table--enable-row-transition .el-table__body td {
     cursor: pointer;
   }
 }
+
 .demo-drawer-content {
   margin-top: 10px;
 }