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,26 +987,44 @@ export default {
         this.saveLoading = false;
       });
     },
+    handleRemark(){
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve'){
+          comFlag
+        }
+      })
+    },
     //提交事件
     handleSubmit() {
-      this.isSubmit = true;
+      let comFlag = 0
-      this.qdform.commentText = this.commentText;
+      this.dataList.map(item => {
-      this.qdform.dataList = this.dataList
+        if(item.involve === 'noInvolve' && item.remarks === ''){
-      const json = JSON.stringify(this.qdform);
+          comFlag++
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
         }
-        this.isSubmit = false;
+      })
-      }, e => {
+      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);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          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/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"