Merge branch 'develop' into 'test'

Develop

See merge request !105

src/pages/localTool/standardWarning.vue

@@ -47,14 +47,14 @@
                         <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standCode" label="编号" align="center">
+                    <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
@@ -112,14 +112,14 @@
                         <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standCode" label="编号" align="center">
+                    <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
@@ -170,12 +170,12 @@
                   >
                     <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="itemsId" label="条款号" align="center">
@@ -236,12 +236,12 @@
                   >
                     <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="itemsId" label="条款号" align="center">
@@ -492,6 +492,17 @@ export default {
         }, e => {
       });
     },
+    //点击查看详情
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.standId,
+          pageType: item.standType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     //获取政策预警数据(type用于区别分页器切换)
     getPolicyDate() {
       this.loading[this.field] = true

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

@@ -82,7 +82,9 @@
         <template slot="title">拆分信息</template>
       </ProcessTitle>
       <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+        <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">
+          批量编辑
+        </el-button>
       </div>
       <el-table border
                 ref="selection"
@@ -114,7 +116,9 @@
           show-overflow-tooltip
           align="center">
           <template slot-scope="scope">
-                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+            <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">
+              查看条款内容
+            </el-button>
           </template>
         </el-table-column>
         <el-table-column
@@ -211,11 +215,13 @@
                       size="mini"
                       class="common-button-primary"
 
-                                                @click="sarStandCompareHisInfo">查询</el-button>
+                      @click="sarStandCompareHisInfo">查询
+                    </el-button>
                     <el-button
                       class="common-button-default"
                       size="mini"
-                                                @click="clearSearchStand">清空</el-button>
+                      @click="clearSearchStand">清空
+                    </el-button>
                   </el-formItem>
                 </el-form>
               </div>
@@ -300,7 +306,10 @@
                   label="标准号"
                 >
                   <template slot-scope="scope">
-                                        <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
+                    <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{
+                        scope.row.standNumber
+                      }}-{{ scope.row.standYear }}
+                    </div>
                     <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
                   </template>
                 </el-table-column>
@@ -357,7 +366,8 @@
       size="800px">
       <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
       <div slot="footer">
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭
+        </el-button>
       </div>
     </el-dialog>
     <Role-tree
@@ -376,6 +386,7 @@
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {saveTaskFirst} from 'api/process'
+
 export default {
   name: "bzjdStep1",
   data() {
@@ -463,6 +474,7 @@
       },
       roleRow: {},
       itemList: [],
+      itemListOld: [],
       zrType: '',
       zrIndex: '',
       zrIdList: []
@@ -645,7 +657,13 @@
               item.zrUserId = ''
               item.zrUserIdName = ''
             })
-                            this.itemList = res.data.list
+
+            this.itemList = res.data.list.filter(item =>{
+              return item.workFlowShow === '1'
+            })
+            this.itemListOld = res.data.list.filter(item =>{
+              return item.workFlowShow === '0'
+            })
           }
           this.loading = false
         })
@@ -790,6 +808,7 @@
                     json.commentText = this.commentText
                     json.standInData = this.sarType
                     json.itemList = this.itemList
+                    json.itemListOld = this.itemListOld
                     this.$http.post('lawss/activiti/completeTask', {
                       json: JSON.stringify(json),
                       taskId: res.data,
@@ -830,6 +849,7 @@
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
+
 .bzjdStep1 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -837,8 +857,10 @@
       padding: 0 20px 0;
     }
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -846,6 +868,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -853,12 +876,14 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -866,33 +891,41 @@
     height: calc(~'100% - 107px');
     overflow: auto;
   }
+
   .standardForComments {
     height: 100%;
     background: #fff;
+
     .el-divider--horizontal {
       display: block;
       height: 1px;
       width: 100%;
       margin: 0;
     }
+
     flex-direction: column;
+
     .action-bar {
       margin-bottom: 5px;
       padding: 0;
     }
+
     .content {
       flex: auto;
       overflow: hidden;
       display: flex;
       flex-direction: column;
+
       .table-wrap {
         flex: auto;
         overflow: hidden;
         position: relative;
       }
     }
+
     & > .pagination {
       position: static;
+
       /deep/ .pagination-slot {
         padding: 0;
       }

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

@@ -42,6 +42,12 @@
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
+            </el-button>
+          </div>
+        </div>
         <el-table
           :data="dataList"
           style="width: 100%; border: 1px solid #cccccc"
@@ -237,6 +243,17 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+<!--          以后全选可能用-->
+<!--          <el-table-column-->
+<!--              prop="productionCompletionTime"-->
+<!--              align="center"-->
+<!--              fixed="right"-->
+<!--              width="160"-->
+<!--              label="操作">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
       </div>
       <div>
@@ -331,6 +348,73 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <el-drawer
+        title="批量填写"
+        :visible.sync="modalshowflag"
+        :wrapperClosable="false"
+        size="800px">
+      <div class="demo-drawer-content">
+        <el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
+          <el-divider><span><b>在研产品</b></span></el-divider>
+          <el-formItem label="合规原因" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.complianceReasons"
+                placeholder="请输入合规原因"
+            ></el-input>
+          </el-formItem>
+          <el-form-item label="不合规项目" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.noCompliance"
+                placeholder="请输入不合规项目"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="不合规应对措施" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.countermeasures"
+                placeholder="请输入不合规应对措施"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="完成时间" class="add-form-item" >
+            <el-date-picker
+                v-model="batchEditForm.completionTime"
+                type="date"
+                placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <br>
+          <el-divider><span><b>在产产品</b></span></el-divider>
+          <el-formItem label="合规原因" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.zcComplianceReasons"
+                placeholder="请输入合规原因"
+            ></el-input>
+          </el-formItem>
+          <el-form-item label="不合规项目" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.zcNoCompliance"
+                placeholder="请输入不合规项目"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="不合规应对措施" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.zcCountermeasures"
+                placeholder="请输入不合规应对措施"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="完成时间" class="add-form-item" >
+            <el-date-picker
+                v-model="batchEditForm.zcCompletionTime"
+                type="date"
+                placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">确定</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -349,6 +433,27 @@ export default {
   },
   data() {
     return {
+      batchEditForm: {
+        // 在研产品
+        // 合规
+        complianceReasons :'',
+        // 不合规
+        noCompliance :'',
+        // 应对措施
+        countermeasures :'',
+        // 完成时间
+        completionTime :'',
+
+        // 在产产品
+        // 合规
+        zcComplianceReasons :'',
+        // 不合规
+        zcNoCompliance:'',
+        // 应对措施
+        zcCountermeasures:'',
+        // 完成时间
+        zcCompletionTime:''
+      },
       hasChildren: true,
       active: "1",
       loading: false,
@@ -398,6 +503,83 @@ export default {
     };
   },
   methods: {
+    //批量编辑确定按钮事件
+    saveBatchEditForm() {
+
+      // console.log(this.selectList)
+      for( let a = 0; a < this.dataList.length; a++) {
+        for ( let b = 0; b < this.selectList.length; b++) {
+          if (this.dataList[a].id === this.selectList[b]) {
+            //合规
+            this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
+            //不合规
+            this.dataList[a].noCompliance = this.batchEditForm.noCompliance
+            //应对措施
+            this.dataList[a].countermeasures = this.batchEditForm.countermeasures
+            //完成时间
+            this.dataList[a].completionTime = this.batchEditForm.completionTime
+            //合规
+            this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
+            //不合规
+            this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
+            //应对措施
+            this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
+            //完成时间
+            this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
+          }else {
+            for (let i=0;i<this.dataList[a].children.length;i++){
+              if (this.dataList[a].children[i].id === this.selectList[b]){
+                //合规
+                this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
+                //不合规
+                this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
+                //应对措施
+                this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
+                //完成时间
+                this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
+                //合规
+                this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
+                //不合规
+                this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
+                //应对措施
+                this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
+                //完成时间
+                this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
+              }
+            }
+          }
+
+        }
+      }
+      this.modalshowflag = false
+    },
+    cancelBatchEditForm() {
+      this.modalshowflag = false
+    },
+    //批量编辑
+    batchEdit() {
+      if (this.selectList.length > 0) {
+        //合规
+        this.batchEditForm.complianceReasons = ''
+        //不合规
+        this.batchEditForm.noCompliance = ''
+        //应对措施
+        this.batchEditForm.countermeasures = ''
+        //完成时间
+        this.batchEditForm.completionTime = ''
+        //合规
+        this.batchEditForm.zcComplianceReasons = ''
+        //不合规
+        this.batchEditForm.zcNoCompliance = ''
+        //应对措施
+        this.batchEditForm.zcCountermeasures = ''
+        //完成时间
+        this.batchEditForm.zcCompletionTime = ''
+        this.modalshowflag = true
+      } else {
+        this.$message.warning('请选择要编辑的数据')
+      }
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({
@@ -525,7 +707,11 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
-      this.selectList = data;
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+
     },
     getTree() {
       this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
@@ -605,6 +791,25 @@ export default {
     height: calc(~'100% - 103px');
     overflow: auto;
 
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+
     .accessStandardsAndRegulations {
       height: 100%;
     }