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

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -135,7 +135,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
-            <el-select v-model="attributeEO.selVal" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
+            <el-select v-model="attributeEO.selVal" placeholder="请选择"  filterable>
               <el-option
                 v-for="item in relateDicIdOptions"
                 :label="item.label"

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

@@ -0,0 +1,432 @@
+<template>
+  <div class="bzjdStep6">
+    <!--    标准调研流程-->
+    <ProcessHeader toggle>
+      <template slot="proName">标准解读流程</template>
+      <template slot="proNode">部长审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="overflow: auto;">
+        <el-form
+          ref="bzzqyjForm"
+          :model="form"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border">
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.itemsNum"
+                    placeholder="请输入标准编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.itemsName"
+                    placeholder="请输入标准名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                  <el-input
+                    disabled
+                    v-model="form.itemsNum1"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                  <el-input
+                    disabled
+                    v-model="form.itemsNum1"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                  <el-input
+                    disabled
+                    v-model="form.itemsName1"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                  <el-input
+                    disabled
+                    v-model="form.itemsName1"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </div>
+      <ProcessTitle>
+        <template slot="title">拆分信息</template>
+      </ProcessTitle>
+      <el-table border
+                ref="selection"
+                :data="itemList"
+                tooltip-effect="dark"
+                style="width: 100%;"
+                height="100%"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                row-key="id"
+      >
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column
+          prop="itemsNum"
+          label="条款号"
+          width="70"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="itemsName"
+          label="条款名称"
+          show-overflow-tooltip
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="itermsConditions"
+          label="条款内容"
+          width="200"
+          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>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          width="150"
+          label="核心技术要求"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          v-if="sarType === 'INLAND'"
+          prop="changePoint"
+          width="150"
+          label="基于上一版本差异"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          v-if="sarType === 'FOREIGN'"
+          prop="changePoint"
+          width="150"
+          label="相对于国行标差异点"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="complianceRequir"
+          width="150"
+          label="符合项状态"
+          align="center">
+          <template slot-scope="scope">
+            <div v-if="scope.row.complianceRequir === '1'">符合</div>
+            <div v-else>不符合</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="complianceState"
+          width="150"
+          label="合规性分析"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="newData"
+          width="250"
+          label="新车型实施日期"
+          align="center">
+          <template slot-scope="scope">
+            <div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD')  : scope.row.newData }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="onlineData"
+          width="250"
+          label="在产车型实施日期"
+          align="center">
+          <template slot-scope="scope">
+            <div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD')  : scope.row.onlineData }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="applyArctic"
+          width="150"
+          label="适用车型"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="unitDeptName"
+          label="责任部门"
+          width="170"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          label="责任人"
+          width="170"
+          prop="zrUserIdName"
+          align="center">
+        </el-table-column>
+      </el-table>
+      <el-collapse accordion>
+        <el-collapse-item title="意见填写">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <el-table
+        height="100%"
+        ref="selection"
+        :data="histortData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        row-key="id"
+        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+        <el-table-column
+          prop="name"
+          label="任务步骤"
+          align="center"
+          sortable="custom"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="assignee"
+          label="任务受理人"
+          align="center"
+          sortable="custom"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          sortable="custom"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="endTime"
+          label="完成时间"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="comment"
+          label="审批意见"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.commentText }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="completeFlag"
+          label="状态"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-dialog
+      title="查看条款内容"
+      :visible.sync="itermsConditionsFlag"
+      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>
+      </div>
+    </el-dialog>
+    <loading :loading="loading">加载中...</loading>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from '../../components/ProcessHeader'
+import ProcessFooter from '../../components/ProcessFooter'
+import ProcessTitle from '../../components/ProcessTitle'
+import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+
+export default {
+  name: "bzjdStep1-6",
+  data() {
+    return {
+      itermsConditionsFlag: false,
+      itermsConditionsTitle: '',
+      histortData: [],
+      sarType: '',
+      itemList: [],
+      loading: true,
+      commentText: '',
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      textarea: '', // 意见
+      active: '1', // 默认显示
+      isSubmit: false,
+      saveLoading: false,
+      form: {
+        itemsNum: '',
+        itemsName: '',
+        itemsNum1: '',
+        itemsName1: '',
+      },
+      json: {},
+    }
+  },
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  methods: {
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.itermsConditionsFlag = true
+      this.itermsConditionsTitle = row
+    },
+    getHistoryData () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+      }, {}, res => {
+        this.histortData = res
+      }, e => {})
+    },
+    handleTabs(name) {
+      this.active = name
+    },
+    handleSave() {},
+    handleSubmitNo () {
+      if (this.commentText) {
+        this.isSubmit = true
+        var json = this.json
+        json.gcApplyFlag = 2
+        json.commentText = this.commentText
+        this.$http.post('lawss/activiti/completeTask', {
+          json: JSON.stringify(json),
+          taskId: this.taskIds,
+          userId: this.$store.getters.userInfo.userId
+        }, {}, res => {
+          if (res.success) {
+            this.$message.success('驳回成功')
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        })
+      } else {
+        this.$message.warning('请输入反馈意见')
+      }
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          let data = JSON.parse(res.mesg)
+          this.form.itemsNum = data.itemsNum || data.form.itemsNum
+          this.form.itemsName = data.itemsName || data.form.itemsName
+          this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+          this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+          this.sarType = data.standInData || data.sarType
+          this.json = data
+          this.itemList = data.itemList
+          this.loading = false
+        }).catch(e => {
+        })
+      })
+    },
+  },
+  mounted () {
+    this.getHistoryData()
+    this.getData()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzjdStep6 {
+  /deep/.el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+  .fileClass {
+    cursor: pointer;
+  }
+  .fileClass:hover{
+    color: #0c91e5;
+  }
+  position: relative;
+  height: 100%;
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    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;
+      }
+    }
+  }
+}
+</style>

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

@@ -261,6 +261,7 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
+        fileIds: '',
         listType: "", //区分是哪个清单
         listName: "", //清单名称
         descriptionList: "", //清单说明
@@ -358,6 +359,11 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
+        let filesId = []
+        item.fileName.forEach(itemIds =>{
+          filesId.push(itemIds.id)
+        })
+        this.listForm.fileId = filesId.join(',')
         item.fileName.forEach(itemId => {
           this.fileIds = itemId.id
           this.getFileInfo();

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

@@ -543,8 +543,8 @@
                                         })
                                     } else {
                                         this.$message.warning('流程启动失败')
+                                      this.isSubmit = false
                                     }
-                                    this.isSubmit = false
                                 })
                             } else {
                                 return this.$message.warning('请完善人员信息')

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

@@ -556,8 +556,8 @@ export default {
                   })
                 } else {
                   this.$message.warning('流程启动失败')
+                  this.isSubmit = false
                 }
-                this.isSubmit = false
               })
             } else {
               return this.$message.warning('请完善人员信息')

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

@@ -357,7 +357,6 @@
                         json.commentText = this.commentText
                         json.info = this.data
                         json.department = this.$store.getters.userInfo.orgName
-                        json.introduce = true
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -383,17 +382,7 @@
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
                         this.json = data
-                        if (data.introduce) {
+                        this.data = data.info || []
-                            this.data = data.info || []
-                        } else {
-                            this.$http.get('slrs/sar-public-idea-all/getPublicIdea', {
-                                unique: data.uniques
-                            }, {}, res => {
-                                res.data.forEach(item => {
-                                    this.data.push(item)
-                                })
-                            })
-                        }
                     }).catch(e => {
                     })
                 })

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

@@ -330,6 +330,7 @@
                         var json = this.json
                         json.oldinfo = this.oldData
                         json.commentText = this.commentText
+                        json.introduce = true
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -364,6 +365,18 @@
                         })
                         this.json = data
                         this.data = data.summaryList
+                        if (data.introduce) {
+                        } else {
+                            this.$http.get('slrs/sar-public-idea-all/getPublicIdea', {
+                                unique: data.uniques
+                            }, {}, res => {
+                                res.data.forEach(item => {
+                                    item.chapterNumber = item.partCode
+                                    item.responUserName= item.userName
+                                    this.data.push(item)
+                                })
+                            })
+                        }
                     }).catch(e => {
                     })
                 })

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

@@ -204,7 +204,7 @@
           tooltip-effect="dark"
           style="width: 100%"
           border
-          height="100%"
+          height="150%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="selectedChange"
@@ -233,7 +233,7 @@
       </el-table>
       <pagination
         style="position: relative;"
-        :page="pageNo"
+        :page="queryUnqualidiedData.pageNo"
         :total="total"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
@@ -283,13 +283,10 @@ export default {
       standModel: false,
       // 总数
       total: 0,
-      // 当前页数
-      pageNo: 1,
       // 查询未符合项整改数据库数据
       queryUnqualidiedData: {
-        pageNo: 1,
+        current: 1,
-        pageSize: 10,
+        size: this.$store.getters.userInfo.configContent,
-        total: 0,
         closeState: '1',
         standId: '',
         standSerialNumber: '', // 标准号/名称
@@ -344,6 +341,12 @@ export default {
     //点击新增事件
     addList() {
       dicTypeData().then(res => {
+        if (this.pageNo !== undefined) {
+          this.queryUnqualidiedData.current = this.pageNo
+        }
+        if (this.size !== undefined) {
+          this.queryUnqualidiedData.size = this.size
+        }
         this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
         standUnqualified(this.queryUnqualidiedData).then(res => {
           this.unqualidiedData = res.data.records
@@ -553,8 +556,9 @@ export default {
       this.pageNo = page
       this.getTableByPage()
     },
-    pageSizeChange () {
+    pageSizeChange (pageSize) {
-      this.getTableByPage()
+      this.size = pageSize
+      this.getTableByPage(pageSize)
     },
   }
 }

src/pages/processCenter/pages/processDetail/index.vue

@@ -219,6 +219,8 @@ export default {
           }else{
             this.toProcessDetail('xmpg2Step1-2',row)
           }
+        }else if(prcType === '9'){
+          this.toProcessDetail('bzjdStep1-6',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')

src/pages/regulatoryRepository/partCodeApply/index.vue

@@ -42,8 +42,8 @@
       </el-button>
       <el-button type="primary" size="mini" v-btn-permission="'9caea8a46be62a0ae0600de35bad6539'"
                  class="common-button-primary" @click="deletePartCode('demore',null)">
-        <i class="iconfont">&#xe611;</i>
+        <i class="iconfont">&#xe61b;</i>
-        删除
+        批量删除
       </el-button>
     </div>
     <!--表格区域-->

src/router/index.js

@@ -862,6 +862,15 @@ const routes = [
           title: '标准解读流程'
         }
       },
+      {
+        path: '/bzjdStep1-6',
+        name: 'bzjdStep1-6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
     ]
   },
   // 本地工具