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

src/pages/details/otherStandardDetails/index.vue

@@ -46,7 +46,7 @@
                 <div class="details-content-modular basic-information" style="border-top:none">
                   <div class="basic-information-content">
                     <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
-                    <p style="color: #C42626;" class="">
+                    <p class="">
                       <label style=" margin-right: 164px;">标准号</label>
                       <span v-if="sarStandardsInfoEO.standYear">{{
                           sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
@@ -106,7 +106,7 @@
                       <label style=" margin-right: 150px;"
                              title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                       >文本状态</label>
-                      <span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
+                      <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                     </p>
                     <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
                         sarStandardsInfoEO.issueTime || '-'
@@ -3606,7 +3606,7 @@ export default {
 
           .modular-content-p-name {
             display: inline-block;
-            width: 220px;
+            width: 213px;
             height: 43px;
             line-height: 43px;
             font-size: 16px;
@@ -3620,10 +3620,10 @@ export default {
           .modular-content-p-val {
             display: inline-block;
             width: calc(~'100% - 225px');
-            min-height: 50px;
+            //min-height: 50px;
-            line-height: 50px;
+            //line-height: 50px;
-            font-size: 16px;
+            //font-size: 16px;
-            color: #999999;
+            //color: #999999;
             word-break: break-all;
             //overflow: hidden;
             //white-space: nowrap;
@@ -3637,9 +3637,10 @@ export default {
 
             & > .files-title {
               width: calc(~'100% - 120px');
-              min-height: 50px;
+              //报批稿撑开
-              line-height: 50px;
+              //min-height: 50px;
-              font-size: 16px;
+              //line-height: 50px;
+              //font-size: 16px;
               color: #409EFF;
 
               & > a {
@@ -3669,7 +3670,8 @@ export default {
 
             .decomposition-btn {
               position: absolute;
-              top: 10px;
+              //报批稿撑开
+              //top: 10px;
               right: 0;
               padding: 0 10px;
               height: 30px;

src/pages/home2/components/todoList/index.vue

@@ -10,7 +10,8 @@
     <ul>
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
          <div style="height: 30px">
-           <span @click="dealWith(item)" style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
+           <span @click="dealWith(item)" v-if="item.prcName.length<25" style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
+           <span @click="dealWith(item)" v-else style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0,25)+'...' }}</span>
          </div>
       </li>
     </ul>
@@ -625,7 +626,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '标准法规部经理审批') {
+          } else if (row.taskInfo === '确认人确认') {
             this.$router.push({
               name: 'xmqdqrStep3',
               query: {
@@ -636,6 +637,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '产品工程经理汇总清单'){
+            this.$router.push({
+              name: 'xmqdqrStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         case '14':

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

@@ -1874,9 +1874,9 @@
                               this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                               this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
                               console.log(this.form)
-                              this.form.ssrq =  this.$moment(this.form.ssrq).format("YYYY-MM-DD")
+                              this.form.ssrq =  this.form.ssrq?this.$moment(this.form.ssrq).format("YYYY-MM-DD"):null
-                              this.form.zccssrq =  this.$moment(this.form.zccssrq).format("YYYY-MM-DD")
+                              this.form.zccssrq = this.form.zccssrq?this.$moment(this.form.zccssrq).format("YYYY-MM-DD"):null
-                              this.form.xcxssrq =  this.$moment(this.form.xcxssrq).format("YYYY-MM-DD")
+                              this.form.xcxssrq =  this.form.xcxssrq?this.$moment(this.form.xcxssrq).format("YYYY-MM-DD"):null
                               this.form.prcNum = this.prcNum
                               this.form.prcName = this.prcName
                               this.form['id'] = bringData.id

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

@@ -146,32 +146,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>
@@ -653,8 +627,8 @@
           @pageChange="handleSelectPageChange"
           @pageSizeChange="handleSelectPageSizeChange"></pagination>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button class="common-button-default" round icon="el-icon-close" @click="standModel = false">取消</el-button>
+          <el-button class="common-button-default" size="mini"  @click="standModel = false">取消</el-button>
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary"  @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
         </div>
       </div>
     </el-drawer>

src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue

@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">产品经理分发任务</template>
+      <template slot="proNode">确认人确认</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -60,7 +60,7 @@
           :data="dataList"
           border
           ref="selection"
-          height="65%"
+          height="59%"
           @selection-change="selectStandChange"
           style="width: 100%; border:1px solid #ccc"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -139,31 +139,34 @@
           >
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
+            prop="involve"
-            prop="kccvppsbm"
+            width="160px"
-            width="180px"
             align="center"
-            label="卡车VPPS编码">
+            label="标准是否涉及">
+             <template slot-scope="scope">
+               <el-select v-model="scope.row.involve"
+                          placeholder="请选择涉不涉及"
+                          max-length="30"
+                          clearable>
+                 <el-option value="involve" label="涉及"></el-option>
+                 <el-option value="noInvolve" label="不涉及"></el-option>
+               </el-select>
+             </template>
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
+            prop="remarks"
-            prop="kccvppscn"
-            width="180px"
             align="center"
-            label="卡车vpps中文名称">
+            width="180"
-          </el-table-column>
+            label="备注">
-          <el-table-column
+            <template slot-scope="scope">
-            prop="cycvppsbm"
+              <el-input
-            width="180px"
+                v-model.trim="dataList[scope.$index].remarks"
-            align="center"
+                placeholder="请输入备注"
-            label="乘用车VPPS编码">
+              >
-          </el-table-column>
+              </el-input>
-          <el-table-column
+            </template>
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
           </el-table-column>
+
         </el-table>
       </div>
       <div>
@@ -645,8 +648,8 @@
           @pageChange="handleSelectPageChange"
           @pageSizeChange="handleSelectPageSizeChange"></pagination>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button class="common-button-default" round icon="el-icon-close" @click="standModel = false">取消</el-button>
+          <el-button class="common-button-default" size="mini" @click="standModel = false">取消</el-button>
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary"  @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
         </div>
       </div>
     </el-drawer>
@@ -678,13 +681,6 @@
     <!--      :approval="true"-->
     <!--    >-->
     <!--    </ProcessFooter>-->
-    <!--    多选确认人-->
-    <Role-tree
-      is-title="选择责任部门对接人"
-      :is-visible.sync="modalshowflag"
-      @checkedRole="checkedRole2"
-      :nodeList="nodeList2"
-    ></Role-tree>
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
       check-box
@@ -908,16 +904,22 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         if(item.form === undefined){
           this.qdform = JSON.parse(JSON.stringify(item));
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
-          this.projectId = item.projectId;
+          this.dataList = item.dataList
-          //获取清单id 查询对应清单下的标准
+          this.dataList.forEach(item => {
-          this.detailedId = item.detailedListId;
+            this.$set(item, 'involve', 'involve')
-          this.getStandData();
+            this.$set(item, 'remarks', '')
+          })
+          // this.projectId = item.projectId;
+          // //获取清单id 查询对应清单下的标准
+          // this.detailedId = item.detailedListId;
+          // this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
@@ -985,9 +987,26 @@ export default {
         this.saveLoading = false;
       });
     },
+    handleRemark(){
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve'){
+          comFlag
+        }
+      })
+    },
     //提交事件
     handleSubmit() {
+      let comFlag = 0
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve' && item.remarks === ''){
+          comFlag++
+        }
+      })
+      if(comFlag > 0){
+        this.$message.warning('请填写不涉及的备注信息')
+      }else{
         this.isSubmit = true;
+        this.qdform.currentPerson = this.$store.getters.userInfo.userName;
         this.qdform.commentText = this.commentText;
         this.qdform.dataList = this.dataList
         const json = JSON.stringify(this.qdform);
@@ -1005,6 +1024,7 @@ export default {
           this.isSubmit = false;
         }, e => {
         });
+      }
     },
     addList() {
       this.searchLawBtn()
@@ -1181,6 +1201,10 @@ export default {
             this.dataList.push(item)
           }
         })
+        this.dataList.forEach(item => {
+          this.$set(item, 'involve', 'involve')
+          this.$set(item, 'remarks', '')
+        })
         this.standModel = false
       }
     },

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

@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">确认人确认</template>
+      <template slot="proNode">产品经理汇总</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -60,7 +60,7 @@
           :data="dataList"
           border
           ref="selection"
-          height="65%"
+          height="59%"
           @selection-change="selectStandChange"
           style="width: 100%; border:1px solid #ccc"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -139,31 +139,18 @@
           >
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
+            prop="involve"
-            prop="kccvppsbm"
+            width="160px"
-            width="180px"
             align="center"
-            label="卡车VPPS编码">
+            label="标准是否涉及">
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
+            prop="remarks"
-            prop="kccvppscn"
-            width="180px"
             align="center"
-            label="卡车vpps中文名称">
+            width="180"
-          </el-table-column>
+            label="备注">
-          <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>
@@ -252,163 +239,432 @@
     <!--    添加标准抽屉-->
     <el-drawer
       title="添加标准"
+      :wrapperClosable="false"
       :visible.sync="standModel"
       size="900px"
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+        <el-form
-          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+          class="label-input-form"
-            <div class="left">
+          style="margin-top: 15px;"
-              <el-form :model="standCommonlySearch" inline class="label-input-form">
+          label-width="130px"
-                <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
+          :modal="handleSelectForm"
-                  <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable />
+          :inline="true"
-                </el-formItem>
+        >
-                <!--                <el-formItem label="标准类别" prop="standSort" class="search-item">-->
+          <el-form-item label="标准/政策来源" class="search-item">
-                <!--                  <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>-->
+            <el-select
-                <!--                    <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value"-->
+              v-model="handleSelectForm.dataSource"
-                <!--                               :key="opt.value" :label="opt.label">{{ opt.label }}-->
+              @change="dataSourceChange"
-                <!--                    </el-option>-->
+              :popper-append-to-body="false"
-                <!--                  </el-select>-->
+              placeholder="请选择标准来源">
-                <!--                </el-formItem>-->
+              <el-option value="INLAND" label="国内标准库"></el-option>
-                <el-formItem label="标准来源" prop="standType" class="search-item">
+              <el-option value="FOREIGN" label="海外标准库"></el-option>
-                  <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
+              <!--              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>-->
-                    <el-option value="INLAND" key="1" label="国内标准"></el-option>
+              <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
-                    <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
             </el-select>
-                </el-formItem>
+          </el-form-item>
-                <el-formItem class="search-item btn-box">
+          <el-form-item label="标准编号" class="search-item">
+            <el-input
+              v-model="handleSelectForm.lawNumber"
+              @change="lawNumberSearch"
+              placeholder="根据标准编号查找"
+              clearable
+              :maxlength="100"></el-input>
+          </el-form-item>
+          <!--          <el-form-item label="标准名称/政策名称" class="search-item">-->
+          <!--            <el-input-->
+          <!--              v-model="handleSelectForm.lawName"-->
+          <!--              @change="lawNameSearch"-->
+          <!--              placeholder="根据标准名称/政策名称查找"-->
+          <!--              clearable-->
+          <!--              :maxlength="100"></el-input>-->
+          <!--          </el-form-item>-->
+          <el-form-item class="search-item btn-box">
             <el-button
+              size="small"
               type="primary"
-                    size="mini"
               class="common-button-primary"
-                    @click="search">查询
+              @click="searchLawBtn">
+              查询
             </el-button>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
             <el-button
               class="common-button-default"
-                    size="mini"
+              size="small"
-                    @click="clearSearch">清空
+              type="default"
+              @click="clearLawBtn">
+              清空
             </el-button>
-                </el-formItem>
+          </el-form-item>
         </el-form>
-            </div>
+        <loading :loading="lawInfoTableLoading">数据获取中</loading>
         <el-table
-              :data="standardData"
+          ref="selections"
           tooltip-effect="dark"
-              style="width: 100%"
+          style="width: 100%;overflow-y: auto;overflow-x: hidden;"
           border
-              ref="table"
+          :loading="lawInfoTableLoading"
-              height="100%"
+          :data="lawInfoTable"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+          :height="300"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectStand"
+          @selection-change="handleSelectTableChange"
         >
+
           <el-table-column
+            fixed="left"
             type="selection"
             width="55"
             align="center">
           </el-table-column>
+
+          <div v-if="handleSelectForm.dataSource === 'INLAND'">
             <el-table-column
-                prop="code"
+              label="标准号"
-                align="center"
+              width="150"
-                label="标准号">
+            >
               <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
-                      scope.row.standSortShow }}
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                  {{ scope.row.standSortShow }}
                   {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
               prop="standName"
-                align="center"
               label="标准名称"
+              min-width="300"
             >
               <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
             <el-table-column
               prop="issueTime"
-                align="center"
+              sortable="custom"
+              width="120"
               label="发布日期">
               <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column
-                prop="xcxssrqgj"
+              prop="SSRQ"
-                align="center"
+              sortable="custom"
+              width="120"
+              label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="XCXSSRQ"
+              sortable="custom"
+              width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
-                show-overflow-tooltip
+              prop="ZCCSSRQ"
-                prop="zccssrqgj"
+              sortable="custom"
-                align="center"
+              width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="textStatus"
+              sortable="custom"
+              width="110"
+              label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'FOREIGN'">
+            <el-table-column
+              label="标准号"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standSortShow
+                  }}
+                  {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-                prop="textStatus"
+              prop="standName"
-                align="center"
+              label="标准名称"
-                label="文本状态">
+              min-width="300"
+            >
               <template slot-scope="scope">
-                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              sortable="custom"
+              width="120"
+              label="发布日期">
+              <template slot-scope="scope">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else style="color: #333333">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="SSRQ"
+              sortable="custom"
+              width="120"
+              label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="XCXSSRQ"
+              sortable="custom"
+              width="150"
+              label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="ZCCSSRQ"
+              sortable="custom"
+              width="150"
+              label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="textStatus"
+              sortable="custom"
+              width="110"
+              label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'BUSINESS_STAND'">
+            <el-table-column
+              show-overflow-tooltip
+              label="企标编号"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="中文名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standEnName"
+              label="英文名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              label="发布日期"
+              sortable
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="putTime"
+              label="实施日期"
+              sortable
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              sortable
+              prop="standStatusShow"
+              label="文本状态"
+              width="110"
+            >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+              </template>
+            </el-table-column>
+          </div>
+
         </el-table>
-          </div>
+        <!--分页-->
         <pagination
-            :page="page"
+          v-show="this.lawInfoTableLoading === false"
-            :pageSize="pageSize"
+          style="position: relative;"
-            :total="total"
+          :page="handleSelectForm.page"
-            @pageChange="pageChange"
+          :total="handleSelectForm.total"
-            @pageSizeChange="pageSizeChange"
+          @pageChange="handleSelectPageChange"
-          />
+          @pageSizeChange="handleSelectPageSizeChange"></pagination>
+        <div slot="footer" class="demo-drawer-footer">
+          <el-button class="common-button-default" size="mini" @click="standModel = false">取消</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary"  @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
         </div>
       </div>
-      <div class="demo-drawer-footer">
-        <el-button size="mini" @click="cancelStand">取消</el-button>
-        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
-      </div>
     </el-drawer>
-    <!--    <ProcessFooter-->
-    <!--      show-save-->
-    <!--      show-transfer-->
-    <!--      show-affirm-->
-    <!--      :submitLoading="isSubmit"-->
-    <!--      :transfer-loading="isTransfer"-->
-    <!--      :saveLoading="saveLoading"-->
-    <!--      @submit="handleSubmit"-->
-    <!--      @transfer="handleTransfer"-->
-    <!--      @save="handleSave"-->
-    <!--      :approval="true"-->
-    <!--    >-->
-    <!--    </ProcessFooter>-->
     <ProcessFooter
-      :show-save="submitShow"
+      show-save
-      :show-transfer="submitShow"
+      show-transfer
-      :show-affirm="submitShow"
+      show-affirm
-      show-confirm
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @submit="handleSubmit"
       @transfer="handleTransfer"
       @save="handleSave"
-      @accept="handleAccept"
       :approval="true"
     >
     </ProcessFooter>
+    <!--    <ProcessFooter-->
+    <!--      :show-save="submitShow"-->
+    <!--      :show-transfer="submitShow"-->
+    <!--      :show-affirm="submitShow"-->
+    <!--      show-confirm-->
+    <!--      :submitLoading="isSubmit"-->
+    <!--      :transfer-loading="isTransfer"-->
+    <!--      :saveLoading="saveLoading"-->
+    <!--      @submit="handleSubmit"-->
+    <!--      @transfer="handleTransfer"-->
+    <!--      @save="handleSave"-->
+    <!--      @accept="handleAccept"-->
+    <!--      :approval="true"-->
+    <!--    >-->
+    <!--    </ProcessFooter>-->
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
       check-box
@@ -425,7 +681,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew, execTask} from "api/process";
-// name: "xmqdqrStep2",
+
 export default {
   name: "xmqdqrStep4",
   components: {
@@ -435,12 +691,32 @@ export default {
   },
   data() {
     return {
+      lawInfoTableLoading: true,
+      lawInfoTable:[],
+      handleSelectForm: {
+        standName: '', //标准名称
+        numberName: '', //政策名称
+        lawsNumber: '', //政策编号
+        standNumber: '', //标准编号
+        standCode: '', //企标编号
+        dataSource: 'INLAND',
+        lawNumber: '', // 标准编号/政策编号
+        lawName: '', // 标准名称/政策名称
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: '',
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
       drawerTitle:'',
       active: "1",
       nodeList: [],
+      nodeList2: [],
       loading: false,
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -456,6 +732,7 @@ export default {
       standList: [],
       projectStand:[],
       standardData: [],
+      handleSelectTableList: [], //标准数据
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -502,6 +779,14 @@ export default {
     });
   },
   methods: {
+    formatIssueDate(str) {
+      const momentDate = this.$moment(str)
+      if (momentDate.isValid()) {
+        return this.$moment(str).format('YYYY-MM-DD')
+      } else {
+        return str
+      }
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true
@@ -609,41 +894,52 @@ export default {
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
+          this.dataList = item.dataList
+          this.dataList.forEach(item => {
+             if(item.involve === 'involve'){
+               item.involve = '涉及'
+             }else if(item.involve === 'noInvolve'){
+               item.involve = '不涉及'
+             }
+          })
           // this.projectId = item.projectId;
-          //获取清单id 查询对应清单下的标准
+          // //获取清单id 查询对应清单下的标准
-          this.detailedId = item.detailedListId;
+          // this.detailedId = item.detailedListId;
           // this.getStandData();
-          this.getStand();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
           this.detailedId = item.form.detailedListId;
-          this.getStand();
         }
       });
     },
     //查询清单下的标准
-    // getStandData() {
+    getStandData() {
-    //   this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
-    //     _this: this
+        _this: this
-    //   }, res => {
+      }, res => {
-    //     this.dataList = res.data.records;
+        this.dataList = res.data.records;
-    //     this.dataList.forEach(item => {
+        this.dataList.forEach(item => {
-    //       // 责任部门转换
+          // 责任部门转换
-    //       if (item.zrbm !== null || item.zrbm !== "") {
+          if (item.zrbm !== null || item.zrbm !== "" ) {
-    //         let k = (item.zrbm || "").split(",");
+            let k = (item.zrbm || "").split(",");
-    //         for (let i in this.zrbmOptions) {
+            for (let i in this.zrbmOptions) {
-    //           for (let m = 0; m < k.length; m++) {
+              for (let m = 0; m < k.length; m++) {
-    //             if (this.zrbmOptions[i].value === k[m]) {
+                if (this.zrbmOptions[i].value === k[m]) {
-    //               k[m] = this.zrbmOptions[i].label;
+                  k[m] = this.zrbmOptions[i].label;
-    //             }
+                }
-    //             item.zrbm = k.join(",");
+                item.zrbm = k.join(",");
-    //           }
+              }
-    //         }
+            }
-    //       }
+          }
-    //     });
+        });
-    //   });
+        this.dataList.map(item => {
-    // },
+          if(item.zrbm === '[]'){
+            item.zrbm = ''
+          }
+        })
+      });
+    },
     // 接受按钮
     handleAccept(){
       this.isSubmit = true
@@ -677,8 +973,24 @@ export default {
         this.saveLoading = false;
       });
     },
+    handleRemark(){
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve'){
+          comFlag
+        }
+      })
+    },
     //提交事件
     handleSubmit() {
+      let comFlag = 0
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve' && item.remarks === ''){
+          comFlag++
+        }
+      })
+      if(comFlag > 0){
+        this.$message.warning('请填写不涉及的备注信息')
+      }else{
         this.isSubmit = true;
         this.qdform.commentText = this.commentText;
         this.qdform.dataList = this.dataList
@@ -697,8 +1009,10 @@ export default {
           this.isSubmit = false;
         }, e => {
         });
+      }
     },
     addList() {
+      this.searchLawBtn()
       this.standModel = true;
     },
     //批量删除
@@ -726,8 +1040,9 @@ export default {
       }
     },
     //添加标准勾选框数据
-    selectStand(data) {
+    handleSelectTableChange (data) {
-      this.standList = data;
+      this.handleSelectTableList = data
+      console.log(this.handleSelectTableList);
     },
     selectStandChange(data){
       this.projectStand = data
@@ -764,52 +1079,141 @@ export default {
       }
 
     },
+    //手动查找的清空按钮
+    clearLawBtn(){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.lawNumber = ''
+      this.handleSelectForm.standNumber = ''
+      this.handleSelectForm.lawsNumber = ''
+      this.handleSelectForm.standCode = ''
+      //清空标准名称/政策名称的查询
+      this.handleSelectForm.lawName = ''
+      this.handleSelectForm.standName = ''
+      this.handleSelectForm.numberName = ''
+      this.searchLawBtn()
+    },
     //添加标准的查询按钮
-    search() {
+    searchLawBtn(){
-      this.page = 1;
+      this.lawInfoTableLoading = true
-      this.getStand();
+      if (this.handleSelectForm.dataSource === 'INLAND'){
-    },
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
-    clearSearch() {
-      this.standCommonlySearch = {
-        standSort: "",
-        standNumber: "",
-        standType: ""
-      };
-      this.getStand();
-    },
-    pageChange(page) {
-      this.page = page;
-      this.getStand();
-    },
-    pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
-      this.getStand();
-    },
-    //查询清单下的标准
-    getStand() {
-      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-        id: this.detailedId,
-        page: this.page,
-        Size: this.pageSize,
-        ...this.standCommonlySearch
-      }, {
           _this: this
-      }, res => {
+        },res=>{
-        if (res.data === null) {
+          console.log('国内标准库数据',res)
-          this.standardData = "";
+          if (res.ok){
-          this.totalDo = "";
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+              this.lawInfoTableLoading = false
             }
-        this.standardData = res.data.records;
+          }else {
-        this.standardData.forEach(item => {
+            this.$message.error(res.message)
-          if (item.zccssrqgj === "-" || item.zccssrqgj === 'null' || item.zccssrqgj === 'undefined') {
-            item.zccssrqgj = "";
           }
-          if (item.xcxssrqgj === "-" || item.xcxssrqgj === 'null' || item.xcxssrqgj === 'undefined' ) {
+        },e=>{
-            item.xcxssrqgj = "";
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
             }
-        });
+          }else {
-        this.total = res.data.total;
+            this.$message.error(res.message)
-      });
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else {
+        this.$message.warning('请先选择标准/政策来源')
+      }
+    },
+    handleSelectConfirm(){
+      if(this.handleSelectTableList.length < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.standList.forEach(item =>{
+          if(item.ssrq === "-"){
+            item.ssrq = ''
+          }
+          if(item.zrbm === '[]'){
+            item.zrbm =''
+          }
+        })
+        this.handleSelectTableList.map(item => {
+          let addIndex
+          addIndex = this.dataList.findIndex(items =>{
+            return items.id === item.id
+          })
+          if(addIndex > -1){
+            this.$message.warning('请勿重复添加数据')
+          }else{
+            this.dataList.push(item)
+          }
+        })
+        this.dataList.forEach(item => {
+          this.$set(item, 'involve', 'involve')
+          this.$set(item, 'remarks', '')
+        })
+        this.standModel = false
+      }
+    },
+    dataSourceChange() {
+      this.handleSelectForm.page = 1
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.standType = this.handleSelectForm.dataSource
+      this.searchLawBtn()
+    },
+    //根据标准编号的查询
+    lawNumberSearch() {
+      this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
+    },
+    handleSelectPageChange(page){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.page = page
+      this.searchLawBtn()
+    },
+    handleSelectPageSizeChange(pageSize){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.pageSize = pageSize
+      this.searchLawBtn()
     },
   },
   computed: {

src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue

@@ -132,32 +132,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/processList/tabComponents/processCenter/index.vue

@@ -879,7 +879,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if(row.taskInfo === '标准法规部经理审批'){
+          } else if(row.taskInfo === '确认人确认'){
             this.$router.push({
               name: 'xmqdqrStep3',
               query: {
@@ -890,6 +890,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '产品工程经理汇总清单'){
+            this.$router.push({
+              name: 'xmqdqrStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         case 'laws2':

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -150,7 +150,7 @@
                    :loading="delLoading"
                    size="mini"
                    @click="deleteStand(2)"
-                   v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'"><i class="iconfont">&#xe61b;</i>批量删除
+                   v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'"><i class="iconfont">&#xe61b;</i>批量删除
         </el-button>
         <el-button class="common-button-default"
                    size="mini"