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

src/assets/languages/cn.js

@@ -407,6 +407,7 @@ export const m = {
   PleaseSelectYourFieldOfExpertise: '请选择所属专业领域',
   pleaseEnterComments: '请输入备注',
   standardNo: '标准号',
+  enterpriseStandardNumber: '企标号',
   nameStandard: '标准名称',
   theImportFile: '导入文件',
   specialEffectiveDate: '特殊生效日期',

src/assets/languages/en.js

@@ -236,6 +236,7 @@ export const m = {
   pleaseSelectApplicableArea: 'PleaseSelectApplicableArea',
   country: 'Country',
   itemNumber: 'ItemNumber',
+  enterpriseStandardNumber: 'enterpriseStandardNumber',
   entryName: 'EntryName',
   clauseRequirements: 'ClauseRequirements',
   keyPointsOfimplementation: 'KeyPointsOfimplementation',

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/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -97,7 +97,7 @@
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-if="splitStatus === '4'" v-btn-permission="''">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-if="splitStatus === '0'" v-btn-permission="''">编辑</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-else :disabled="true" v-btn-permission="''">编辑</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>

src/pages/login/index.vue

@@ -27,6 +27,7 @@
 
 <script>
 import { mapMutations, mapActions } from 'vuex'
+import axios from 'axios'
 export default {
   name: 'Login',
   data () {
@@ -292,6 +293,34 @@ export default {
   computed: {
   },
   mounted () {
+    let url = window.location.search
+    if (url) {
+      url = url.substr(1);
+      url = url.split('&');
+      let info = [];
+      let obj = {};
+      for (let i = 0,len = url.length; i < len; i++) {
+        info = url[i].split('=')
+        obj[info[0]] = decodeURI(info[1]);
+        url[i] = obj;
+      }
+      var code = url[0].code
+      axios.post('http://testsso1.foton.com.cn/oauth2.0/accessTokenByJson',
+              {
+                client_id: 'app_slrs',
+                client_secret: 'wj5iDTqyguQCxnsoo5VU21BoRSZqevhI',
+                grant_type: 'authorization_code',
+                redirect_uri: 'http://62.234.136.153:8038',
+                code: code
+              }
+      ).then(function (response) {
+        console.log(response);
+      }).catch(function (error) {
+        console.log(error);
+      });
+    } else {
+    }
+
     if (this.$store.state.laws_urm !== '') {
       this.isRemember = true
     }

src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue

@@ -0,0 +1,392 @@
+<template>
+  <div class="bzdyStep9">
+    <!--    标准调研流程-->
+    <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="flex: auto; overflow: auto;">
+        <el-form
+          ref="qbkwForm"
+          :model="form"
+          :rules="formRules"
+          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="12">
+                <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.title"
+                    placeholder="请输入调研标题"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="完成时间" prop="date" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                    disabled
+                    v-model="form.date"
+                    type="date"
+                    placeholder="请选择完成时间">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="汇总调研结果" prop="hzfileId" class="add-form-item form-item-disabled">
+                  <div v-if="form.hzfileName" @click="updateFile(form.hzfileId)" class="fileClass">
+                    {{ form.hzfileName }}
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
+                <!--                                <el-form-item label="批准意见" prop="textpz" class="add-form-item form-item-disabled">-->
+                <!--                                    <el-input-->
+                <!--                                            v-model="form.textpz"-->
+                <!--                                            placeholder="请输入批准意见"-->
+                <!--                                            clearable-->
+                <!--                                    ></el-input>-->
+                <!--                                </el-form-item>-->
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <ProcessTitle>
+          <template slot="title">调研信息</template>
+        </ProcessTitle>
+        <div>
+          <el-table
+            :data="tableData"
+            tooltip-effect="dark"
+            class="drag-table"
+            style="width: 100%; flex: auto;"
+            border
+            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+        fontWeight: 'bold', height: '48px'}"
+            ref="selection"
+          >
+            <el-table-column
+              type="index"
+              width="55"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="责任人"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              label="文件"
+              align="center">
+              <template slot-scope="scope">
+                <div @click="updateFile(scope.row.fileId)" class="fileClass">
+                  {{scope.row.fileName}}
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <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>
+    <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 width='400px' :visible.sync="fileMadel" title="上传文件">
+      <el-upload
+        multiple
+        drag
+        :action="fileUrl"
+        ref="importfile"
+        name="file"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        :before-upload="beginImportFile"
+        :on-success="importFileSuccess"
+        :show-file-list="false"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from '../../components/ProcessHeader'
+import ProcessFooter from '../../components/ProcessFooter'
+import ProcessTitle from '../../components/ProcessTitle'
+import {inboundLiaisonDetail} from 'api/process'
+
+export default {
+  name: "bzdyStep1-9",
+  data() {
+    return {
+      histortData: [],
+      commentText: '',
+      tableData: [],
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      active: '1', // 默认显示
+      isSubmit: false,
+      saveLoading: false,
+      form: {
+        title: '', // 调研标题
+        date: '', // 完成时间
+        hzfileId: '',
+        hzfileName: '',
+        textpz: ''
+      },
+      formRules: {
+        textpz: [
+          { required: true, message: '请输入审核意见', trigger: 'blur' },
+        ]
+      },
+      json: {},
+      fileUrl: 'api/att/attFile/upload',
+      fileMadel: false,
+    }
+  },
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  methods: {
+    getHistoryData () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+      }, {}, res => {
+        this.histortData = res
+      }, e => {})
+    },
+    updateFile (fileId) {
+      window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
+    },
+    // 导入按钮 上传之前的钩子
+    beginImportFile (file) {
+      var filename = file.name
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      var fileSuffix = filename.substring(index1, index2)
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
+      // 判断上传文件格式
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+        return false
+      }
+      // 判断文件上传大小
+      // eslint-disable-next-line no-unreachable
+      if (file.size / 1024 / 1024 <= 200) {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+        return false
+      }
+      return true
+    },
+    // 导入标准数据成功后执行
+    importFileSuccess (response, file) {
+      if (response.ok) {
+        this.fileMadel = false
+        this.form.hzfileId = response.data.id
+        this.form.hzfileName = response.data.name
+        this.$message({
+          showClose: true,
+          message: response.message,
+          type: 'success'
+        })
+      }
+    },
+    fileUpload () {
+      this.fileMadel = true
+    },
+    handleTabs(name) {
+      this.active = name
+    },
+    handleSave() {},
+    handleSubmitNo() {
+      if (this.commentText) {
+        this.isSubmit = true
+        var json = this.json
+        json.commentText = this.commentText
+        json.actionFlag = 1
+        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.title = data.title || data.form.title
+          this.form.date = data.date || data.form.date
+          this.json = data || data.form
+          this.tableData = data.responUserList || data.form.responUserList
+          this.form.hzfileId = data.hzfileId || data.form.hzfileId
+          this.form.hzfileName = data.hzfileName || data.form.hzfileName
+        }).catch(e => {
+        })
+      })
+    },
+  },
+  mounted () {
+    this.getHistoryData()
+    this.getData()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzdyStep9 {
+  /deep/.el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+  position: relative;
+  height: 100%;
+  .fileClass {
+    cursor: pointer;
+  }
+  .fileClass:hover{
+    color: #0c91e5;
+  }
+  .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/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

@@ -552,12 +552,16 @@ export default {
                     if (res.success) {
                       this.$message.success('流程发起成功')
                       this.$router.push('/processCenter')
+                      this.isSubmit = false
+                    } else {
+                      this.$message.warning('流程启动失败')
+                      this.isSubmit = false
                     }
                   })
                 } else {
                   this.$message.warning('流程启动失败')
+                  this.isSubmit = false
                 }
-                this.isSubmit = false
               })
             } else {
               return this.$message.warning('请完善人员信息')

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

@@ -221,7 +221,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
 
     export default {
         name: "bzzqyjStep3",
@@ -324,7 +324,22 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
+            handleSave() {
+                this.saveLoading = true
+                let _formData = new FormData()
+                _formData.append('taskIds', this.taskIds)
+                _formData.append('json', JSON.stringify({
+                    form: this.form,
+                    data: this.data,
+                    commentText: this.commentText,
+                }))
+                saveTaskForPub(_formData).then(res => {
+                    this.saveLoading = false
+                    this.$message.success('保存成功')
+                }).catch(e => {
+                    this.saveLoading = false
+                })
+            },
             handleSubmit() {
                 if (this.data.length < 1) {
                     this.$message.warning('请输入征求意见')
@@ -357,7 +372,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,
@@ -379,21 +393,11 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+                        this.form.cid = data.cid || data.form.cid
-                        this.form.endTime = data.endTime
+                        this.form.endTime = data.endTime || data.form.endTime
-                        this.form.cname = data.cname
+                        this.form.cname = data.cname || data.form.cname
                         this.json = data
-                        if (data.introduce) {
+                        this.data = data.info || data.data || []
-                            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/step4.vue

@@ -301,11 +301,11 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+                        this.form.cid = data.cid || data.form.cid
-                        this.form.endTime = data.endTime
+                        this.form.endTime = data.endTime || data.form.endTime
-                        this.form.cname = data.cname
+                        this.form.cname = data.cname || data.form.cname
                         this.json = data
-                        this.data = data.info
+                        this.data = data.info || data.data
                     }).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,
@@ -351,9 +352,9 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+                        this.form.cid = data.cid || data.form.cid
-                        this.form.endTime = data.endTime
+                        this.form.endTime = data.endTime || data.form.endTime
-                        this.form.cname = data.cname
+                        this.form.cname = data.cname || data.form.cname
                         this.oldData = JSON.parse(JSON.stringify(data.summaryList))
                         data.summaryList.forEach( item => {
                             if (item.state) {
@@ -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,12 @@ export default {
           }else{
             this.toProcessDetail('xmpg2Step1-2',row)
           }
+          //标准解读流程
+        }else if(prcType === '9'){
+          this.toProcessDetail('bzjdStep1-6',row)
+          //标准调研流程
+        }else if(prcType === '2'){
+          this.toProcessDetail('bzdyStep1-9',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -435,7 +435,7 @@
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="标准年份" prop="standYear" label-width="150px" class="add-form-item">
-                        <el-input v-model="sarBussionessStandEO.standYear"
+                        <el-input v-model.number="sarBussionessStandEO.standYear"
                                   placeholder="请输入标准年份"
                                   value-format="yyyy-MM-dd"
                                   clearable></el-input>
@@ -870,7 +870,212 @@
         </div>
       </el-dialog>
     </div>
-    <!--高级查询-->
+      <el-drawer
+              title="高级搜索"
+              size="700px"
+              :wrapperClosable="false"
+              :visible.sync="isAdvancedSearch">
+          <div class="demo-drawer-content">
+              <el-form
+              :model="sarBussionessSearch"
+              :inline="true"
+              class="label-input-form table-lattice"
+              label-width="76px"
+              style="display: flex;flex-wrap: wrap">
+                  <ProcessTitle>
+                      <template slot="title">基础信息</template>
+                  </ProcessTitle>
+                  <div class="prc-content-border">
+                      <el-row :gutter="24">
+                          <el-col :span="12">
+                              <el-form-item label="企标类别" title="企标类别" class="add-form-item form-item-disabled">
+                                  <el-select v-model="sarBussionessSearch.standSort" filterable clearable>
+                                      <el-option
+                                              v-for="item in standSortOptions"
+                                              placeholder="请选择"
+                                              :key="item.value"
+                                              :value="item.value"
+                                              :label="item.label"
+                                      ></el-option>
+                                  </el-select>
+                              </el-form-item>
+                              <el-form-item label="中文名称" class="add-form-item form-item-disabled">
+                                  <el-input v-model="sarBussionessSearch.standName"
+                                            placeholder="请输入企标名称"
+                                            clearable></el-input>
+                              </el-form-item>
+                              <el-form-item label="英文名称" title="企标英文名称" class="add-form-item form-item-disabled">
+                                  <el-input v-model="sarBussionessSearch.standEnName"
+                                            placeholder="请输入企标英文名称"
+                                            clearable></el-input>
+                              </el-form-item>
+                              <el-form-item label="废止日期" class="add-form-item form-item-disabled">
+                                  <el-datePicker v-model="sarBussionessSearch.FZRQBUSS"
+                                                 :editable="false"
+                                                 placeholder="请选择废止日期"
+                                                 value-format="yyyy-MM-dd"
+                                                 clearable></el-datePicker>
+                              </el-form-item>
+                              <el-form-item label="复审日期" class="add-form-item form-item-disabled">
+                                  <el-datePicker v-model="sarBussionessSearch.FSRQBUSS"
+                                                 :editable="false"
+                                                 placeholder="请选择复审日期"
+                                                 value-format="yyyy-MM-dd"
+                                                 clearable></el-datePicker>
+                              </el-form-item>
+                          </el-col>
+                          <el-col :span="12">
+                              <el-form-item label="企标编号" class="add-form-item form-item-disabled">
+                                  <el-input v-model="sarBussionessSearch.standCode" clearable
+                                            placeholder="请输入企标编号"
+                                            @keyup.enter.native="getDomesticStandardTableBtn(sarBussionessSearch)"></el-input>
+                              </el-form-item>
+                              <el-form-item label="标准年份" class="add-form-item form-item-disabled">
+                                  <el-input v-model.number="sarBussionessSearch.standYear"
+                                            placeholder="请输入标准年份"
+                                            value-format="yyyy-MM-dd"
+                                            clearable></el-input>
+                              </el-form-item>
+                              <el-form-item label="文本状态" class="add-form-item form-item-disabled">
+                                  <el-select v-model="sarBussionessSearch.textStatusBuss"
+                                             placeholder="请选择文本状态"
+                                             clearable>
+                                      <el-option
+                                              v-for="opt in standStateOptions"
+                                              :key="opt.value"
+                                              :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
+                                      >
+                                          {{ opt.label }}
+                                      </el-option>
+                                  </el-select>
+                              </el-form-item>
+                              <el-form-item label="发布日期" class="add-form-item form-item-disabled">
+                                  <el-datePicker v-model="sarBussionessSearch.issueTime"
+                                                 :editable="false"
+                                                 placeholder="请选择发布日期"
+                                                 value-format="yyyy-MM-dd"
+                                                 clearable></el-datePicker>
+                              </el-form-item>
+                              <el-form-item label="实施日期" title="标准实施日期" class="add-form-item form-item-disabled">
+                                  <el-datePicker v-model="sarBussionessSearch.putTime"
+                                                 :editable="false"
+                                                 placeholder="请选择实施日期"
+                                                 value-format="yyyy-MM-dd"
+                                                 clearable
+                                  ></el-datePicker>
+                              </el-form-item>
+                          </el-col>
+                      </el-row>
+                  </div>
+                  <ProcessTitle>
+                      <template slot="title">适用范围</template>
+                  </ProcessTitle>
+                  <div class="prc-content-border">
+                      <el-row :gutter="24">
+                          <el-col :span="12">
+                              <el-form-item label="起草部门" class="add-form-item form-item-disabled">
+                                  <el-select v-model="sarBussionessSearch.QCDW" filterable clearable>
+                                      <el-option
+                                              v-for="item in qcdwOptions"
+                                              placeholder="请选择"
+                                              :key="item.value"
+                                              :value="item.value"
+                                              :label="item.label"
+                                      ></el-option>
+                                  </el-select>
+                              </el-form-item>
+                              <el-form-item label="适用车型" class="add-form-item form-item-disabled">
+                                  <el-select v-model="sarBussionessSearch.SYCXCLASS" filterable clearable>
+                                      <el-option
+                                              v-for="item in applyArcticOptions"
+                                              placeholder="请选择"
+                                              :key="item.value"
+                                              :value="item.value"
+                                              :label="item.label"
+                                      ></el-option>
+                                  </el-select>
+                              </el-form-item>
+                              <el-form-item label="体系类别" class="add-form-item form-item-disabled">
+                                  <el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="请输入体系类别" clearable></el-input>
+                              </el-form-item>
+                              <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
+                                  <el-input v-model="sarBussionessSearch.VPPSBMBUSS" placeholder="请输入模块VPPS编码" clearable></el-input>
+                              </el-form-item>
+                          </el-col>
+                          <el-col :span="12">
+                              <el-form-item label="起草人" class="add-form-item form-item-disabled">
+                                  <el-select v-model="sarBussionessSearch.QCRBUSS" filterable clearable>
+                                      <el-option
+                                              v-for="item in qcrOptions"
+                                              placeholder="请选择"
+                                              :key="item.value"
+                                              :value="item.value"
+                                              :label="item.label"
+                                      ></el-option>
+                                  </el-select>
+                              </el-form-item>
+                              <el-form-item label="能源类型" class="add-form-item form-item-disabled">
+                                  <el-select v-model="sarBussionessSearch.NYLXCLASS" filterable clearable>
+                                      <el-option
+                                              v-for="item in categoryOptions"
+                                              placeholder="请选择"
+                                              :key="item.value"
+                                              :value="item.value"
+                                              :label="item.label"
+                                      ></el-option>
+                                  </el-select>
+                              </el-form-item>
+                              <el-form-item label="适用产品线" title="适用产品线" class="add-form-item form-item-disabled">
+                                  <el-select v-model="sarBussionessSearch.SYCPXCLASS" filterable clearable>
+                                      <el-option
+                                              v-for="item in sycpxOptions"
+                                              placeholder="请选择"
+                                              :key="item.value"
+                                              :value="item.value"
+                                              :label="item.label"
+                                      ></el-option>
+                                  </el-select>
+                              </el-form-item>
+                              <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled">
+                                  <el-input v-model="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input>
+                              </el-form-item>
+                          </el-col>
+                      </el-row>
+                  </div>
+                  <ProcessTitle>
+                      <template slot="title">关联信息</template>
+                  </ProcessTitle>
+                  <div class="prc-content-border">
+                      <el-row :gutter="24">
+                          <el-col :span="12">
+                              <el-form-item label="代替企标编号" title="代替企标编号" class="add-form-item form-item-disabled">
+                                  <el-input v-model="sarBussionessSearch.DTQBBHBUSS" placeholder="请输入模块中文名称" clearable></el-input>
+                              </el-form-item>
+                          </el-col>
+                          <el-col :span="12">
+                              <el-form-item label="被代替企标编号" title="被代替企标编号" class="add-form-item form-item-disabled">
+                                  <el-input v-model="sarBussionessSearch.BDTQBBHBUSS" placeholder="请输入模块中文名称" clearable></el-input>
+                              </el-form-item>
+                          </el-col>
+                      </el-row>
+                  </div>
+              </el-form>
+          </div>
+          <div class="demo-drawer-footer">
+              <el-button
+                      class="common-button-primary"
+                      icon="el-icon-check"
+                      type="primary"
+                      @click="getBussionStandTableBtn(sarBussionessSearch,'','sel')">搜索
+              </el-button>
+              <el-button
+                      class="common-button-default"
+                      icon="el-icon-close"
+                      @click="clearAllSearch('sarBussionessSearch')">取消
+              </el-button>
+          </div>
+      </el-drawer>
+      <!--高级查询-->
 <!--    <AdvancedQuery-->
 <!--      :isAdvancedSearch.sync="isAdvancedSearch"-->
 <!--      :twoOptions="twoOptions"-->
@@ -1000,6 +1205,7 @@ import CustomOrg from '@/components/CustomFormComponents/OrgTree'
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 
 import {mapGetters} from 'vuex'
 export default {
@@ -1016,7 +1222,8 @@ export default {
     CustomOrg,
     CustomSVPPS,
     TreeSelect,
-    TreeSelectNew
+    TreeSelectNew,
+    ProcessTitle
   },
   props: {
   },
@@ -1030,6 +1237,7 @@ export default {
             children: 'children',
             label: 'menuName'
         },
+        advancedSearch:[],
         nodeKey: 'id',
         nodeKeyCode: 'code',
         nodeKeyModel: 'model',
@@ -1526,7 +1734,32 @@ export default {
         applyCountry: '', // 国家/地区
         standNature: '', // 标准性质
         standSort: '', // 企标类别
-        synopsis: '' // 内容摘要
+        synopsis: '', // 内容摘要
+        // 基础信息
+          FZRQBUSS:'',
+          FSRQBUSS:'',
+        // 文本信息
+          FBGBUSS:'',
+          BZSMBUSS:'',
+          LSBBBUSS:'',
+          QTWJBUSS:'',
+        // 适用范围
+          QCDW:'',
+          QCRBUSS:'',
+          WJSCRYBUSS:'',
+          SYCXCLASS:'',
+          NYLXCLASS:'',
+          SYCPXCLASS:'',
+          TXLBBUSS:'',
+          VPPSBMBUSS:'',
+          VPPSCNBUSS:'',
+        // 关联信息
+          DTQBBHBUSS:'',
+          BDTQBBHBUSS:'',
+          XGJLBUSS:'',
+          XGLC:'',
+          GLWJBUSS:'',
+          XCSJBUSS:'',
       }, // 分页查询过程中用到的对象
       total: 0,
       configStandList: [],
@@ -1598,6 +1831,7 @@ export default {
         categoryConfigOptions: [], // 所属类别下拉框
         assemClassOptions: [], // 总成分类下拉框
         qcdwOptions:[],//起草单位下拉框
+        qcrOptions:[],//起草人下拉框
         cysdOptions:[], //我司参与深度下拉框
         nylxOptions:[],//能源类型下拉框
         syrzOptions:[],//适用认证下拉框
@@ -1915,8 +2149,10 @@ export default {
     },
     // 高级检索
     selectMoreBtn () {
-      this.isAdvancedSearch = true
+        this.isAdvancedSearch = true
-      this.threeOptions = []
+        this.sarBussionessSearch = {}
+      // this.isAdvancedSearch = true
+      // this.threeOptions = []
     },
     // 高级检索类型change事件
     twoSelectChange (val) {
@@ -3003,7 +3239,7 @@ export default {
     exportTestItem () {
       if (this.saveExportType === 'apart') {
         if (this.selectedList != null && this.selectedList !== '') {
-          window.open('/api/lawss/sarBussionessStand/exportSarBussionessStand?exportContent=' + this.selectedList.join(',') + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName)
+          window.open('/api/lawss/sarBussionessStand/exportSarBussionessStand?exportContent=' + this.selectedList.join(',') + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName  + '&userId=' + this.$store.getters.userInfo.userId)
           // this.$refs.selection.selectAll(false)
           this.$message({
             message: '导出信息成功',
@@ -3013,7 +3249,7 @@ export default {
       } else if (this.saveExportType === 'all') {
         let exportEOStr = JSON.stringify(this.SarExportSearchEo)
         exportEOStr = exportEOStr.replace(/""/g, null)
-        window.open('/api/lawss/sarBussionessStand/exportSarBussionessStand?exportContent=' + exportEOStr + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName)
+        window.open('/api/lawss/sarBussionessStand/exportSarBussionessStand?exportContent=' + exportEOStr + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName  + '&userId=' + this.$store.getters.userInfo.userId)
         this.$message({
           message: '导出信息成功',
           type: 'success'
@@ -3026,11 +3262,11 @@ export default {
       this.exportModelFlag = false
     },
     // 搜索
-    getBussionStandTableBtn (item, advancedSearch) {
+    getBussionStandTableBtn (item, advancedSearch,type) {
       item.page = 1
       this.tableFlag = item
-      item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
+      // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
-      this.getBussionStandTable(item)
+      this.getBussionStandTable(item,'',type)
     },
     // 清空搜索框
     clearAllSearch (flag) {
@@ -3056,8 +3292,9 @@ export default {
         this.sarBussionessSearch.standStatus = ''
         this.sarBussionessSearch.citationUser = ''
         this.sarBussionessSearch.advanceSearchVOStr = ''
-        this.tableFlag.page = 1
+        this.pageChange(1)
         this.getBussionStandTable(this.sarBussionessSearch)
+        this.isAdvancedSearch = false
       } else if (flag === 2) {
         // 标准条目搜索
         // 标准条目搜索
@@ -3120,7 +3357,7 @@ export default {
       })
     },
     // 分页查询企业标准---表格
-    getBussionStandTable (item, nodeId) {
+    getBussionStandTable (item, nodeId,type) {
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -3152,6 +3389,26 @@ export default {
         this.sarBussionessSearch.labelMenuId = undefined
         this.sarBussionessSearch.collectMenuId = undefined
       }
+        this.sarBussionessSearch.userId = this.$store.getters.userInfo.userId
+        if(type === 'sel'){
+            const advanceSearchVOList = [];
+            if(this.formFieldListData !== undefined && this.formFieldListData !== null){
+                const formFieldList = this.formFieldListData
+                formFieldList.forEach((item) => {
+                    const value = this.sarBussionessSearch[item.attrField]
+                    // 时间格式处理
+                    if (value !== undefined && value !== null && value !== '') {
+                        advanceSearchVOList.push({
+                            connect: advanceSearchVOList.length > 0 ? "and" : "",
+                            field: item.attrField || '',
+                            type: 'like',
+                            value: value
+                        })
+                    }
+                })
+            }
+            this.sarBussionessSearch.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+        }
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', !item ? this.sarBussionessSearch : item, {
         _this: this, loading: 'loading'
       }, res => {
@@ -3167,11 +3424,11 @@ export default {
           res.data.list[i].isSubmit = false
         }
         this.standinfoList = res.data.list
-        console.log(this.standinfoList,'11111111111111111')
         this.total = res.data.count
         if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) {
           this.pageChange(1)
         }
+          this.isAdvancedSearch = false
       }, e => {
       })
       // this.$refs.selection.selectAll(false)
@@ -3652,6 +3909,7 @@ export default {
         this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
         this.txlbOptions = res.data.TXLBCLASS // 体系类别
         this.qcdwOptions = res.data.QCDW // 起草单位
+        this.qcrOptions = res.data.QCRBUSS // 起草人
         this.nylxOptions = res.data.NYLXCLASS // 能源类型
         this.syrzOptions = res.data.SYRZCLASS // 适用认证
         this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
@@ -3661,10 +3919,10 @@ export default {
       // this.classifyCodeOptions = res.data.STANDCLASSIFY
     }, e => {
     })
-    this.getBussionStandTable(this.tableFlag)
-    // this.getOrgTreeSource()
     // 加载动态表单数据
     this.getAddFormFieldList()
+    this.getBussionStandTable(this.tableFlag)
+    // this.getOrgTreeSource()
     this.tableHeight = $('.content').height() - 44 - 20
     window.onresize = () => {
       this.tableHeight = $('.content').height() - 44 - 20
@@ -3679,6 +3937,16 @@ export default {
 </script>
 
 <style lang="less" scoped>
+    /deep/.contentTitle{
+        width: 100%;
+    }
+    /deep/.el-drawer__container {
+        .prc-content-border {
+            /*border: none;*/
+            width: 100%;
+            padding: 0 20px 0;
+        }
+    }
     /deep/ .icon-tree {
         margin:0  5px 0 10px;
         position:relative;

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

@@ -699,115 +699,53 @@ export default {
     cancelStand() {
       this.standModel = false;
     },
-    //如果张宇欢改好了就把这个放开，然后把底下那个注释了
+
-    // okStand() {
+    okStand() {
-    //   let _this = this;
+      let _this = this;
-    //   if (this.standList.length < 1) {
+      if (this.standList.length < 1) {
-    //     _this.$message.warning("请选择标准");
+        _this.$message.warning("请选择标准");
-    //   } else {
+      } else {
-    //     for (let i = 0; i < this.dataList.length; i++) {
+        for (let i = 0; i < this.dataList.length; i++) {
-    //       let newStand = false;
+          let newStand = false;
-    //       for (let j = 0; j < this.standList.length; j++) {
+          for (let j = 0; j < this.standList.length; j++) {
-    //         if (this.standList[j].id == this.dataList[i].standId) {
+            if (this.standList[j].id == this.dataList[i].standId) {
-    //           newStand = true;
+              newStand = true;
-    //           this.standList.splice(j, 1)
+              this.standList.splice(j, 1)
-    //           j--
+              j--
-    //         }
+            }
-    //       }
+          }
-    //       if (newStand) {
+          if (newStand) {
-    //         _this.$message.warning("请勿重复添加数据");
+            _this.$message.warning("请勿重复添加数据");
-    //       } else {
+          } else {
-    //         // _this.dataList.push(item);
+            // _this.dataList.push(item);
-    //       }
+          }
-    //     }
+        }
-    //     this.standardData = []
+        this.standardData = []
-    //     _this.standModel = false;
+        _this.standModel = false;
-    //     for (var i = 0; i < this.standList.length; i++) {
+        for (var i = 0; i < this.standList.length; i++) {
-    //       this.standList1.push({
+          this.standList1.push({
-    //         standId: this.standList[i].id,
+            standId: this.standList[i].id,
-    //         projectId: this.localProEO.id
+            projectId: this.localProEO.id
-    //       })
+          })
-    //     }
+        }
-    //     if (this.standList1 != '') {
+        if (this.standList1 != '') {
-    //       this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
+          this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
-    //         _this: this
+            _this: this
-    //       }, res => {
+          }, res => {
-    //         if (res.ok) {
+            if (res.ok) {
-    //           // this.$message.success(res.message)
+              // this.$message.success(res.message)
-    //           this.getDataList()
+              // this.getDataList()
-    //         }
+              this.showLocalProductData(this.getLocalPro)
-    //       }, e => {
+            }
-    //       });
+          }, e => {
-    //     }
+          });
-    //     this.standList = []
+        }
-    //     this.standList1 = []
+        this.standList = []
-    //     _this.standModel = false;
+        this.standList1 = []
-    //   }
+        _this.detailedListModel = false;
-    // },
+        _this.standModel = false;
-    //添加标准确定事件
+      }
-    okStand(){
-     if(this.standList.length > 0){
-       this.standList.forEach(item => {
-         let addIndex
-         addIndex = this.dataList.findIndex(items => {
-           return items.standId === item.id
-         })
-         if(addIndex > -1){
-           this.$message.warning('请勿重复添加数据')
-         }else{
-           this.dataList.push(item)
-         }
-       })
-       this.detailedListModel = false
-       this.standModel = false
-     }else{
-       this.$message.warning('请至少选择一条数据进行添加')
-     }
     },
-    // okStand() {
-    //   let _this = this;
-    //   if (this.standList.length < 1) {
-    //     _this.$message.warning("请选择标准");
-    //   } else {
-    //     for (let i = 0; i < this.dataList.length; i++) {
-    //       let newStand = false;
-    //       for (let j = 0; j < this.standList.length; j++) {
-    //         if (this.standList[j].id == this.dataList[i].standId) {
-    //           newStand = true;
-    //           this.standList.splice(j, 1)
-    //           j--
-    //         }
-    //       }
-    //       if (newStand) {
-    //         _this.$message.warning("请勿重复添加数据");
-    //       } else {
-    //         // _this.dataList.push(item);
-    //       }
-    //     }
-    //     this.standardData = []
-    //     _this.standModel = false;
-    //     for (var i = 0; i < this.standList.length; i++) {
-    //       this.standList1.push({
-    //         standId: this.standList[i].id,
-    //         projectId: this.localProEO.id
-    //       })
-    //     }
-    //     if (this.standList1 != '') {
-    //       this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
-    //         _this: this
-    //       }, res => {
-    //         if (res.ok) {
-    //           // this.$message.success(res.message)
-    //           this.getDataList()
-    //         }
-    //       }, e => {
-    //       });
-    //     }
-    //     this.standList = []
-    //     this.standList1 = []
-    //     _this.standModel = false;
-    //   }
-    // },
     //获取标准
     getStandrd(data){
       this.detailedId = data.id
@@ -901,7 +839,8 @@ export default {
       this.proId = this.localProEO.id
       // 查询详情表格数据
       this.$http.get('sarStandProjectLibrary/queryStandInfo', {
-        id: this.localProEO.id
+        id: this.localProEO.id,
+        cars: "1"
       }, {
         _this: this,
         loading: 'loading'

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -109,6 +109,13 @@
           <div class="search-area">
             <div class="left">
               <el-form :inline="true" :model="sarProStateEO" class="label-input-form">
+                <el-form-item label="项目编号" class="search-item search-item-last">
+                  <el-input
+                      v-model="sarProStateEO.productId"
+                      placeholder="根据项目编号查找"
+                      :maxlength="100"
+                      clearable></el-input>
+                </el-form-item>
                 <el-form-item label="项目名称" class="search-item search-item-last">
                   <el-input
                     v-model="sarProStateEO.productName"
@@ -116,13 +123,6 @@
                     :maxlength="100"
                     clearable></el-input>
                 </el-form-item>
-                <el-form-item label="项目编号" class="search-item search-item-last">
-                  <el-input
-                    v-model="sarProStateEO.standId"
-                    placeholder="根据项目编号查找"
-                    :maxlength="100"
-                    clearable></el-input>
-                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"
@@ -327,7 +327,7 @@ export default {
       pageSize: this.$store.getters.userInfo.configContent,
       sarProStateEO: {
         productName: "",
-        standId: "",
+        productId: "",
         type: ""
       },
       sarProStateTotal: 0,
@@ -335,7 +335,7 @@ export default {
       sarProStatePageSize: this.$store.getters.userInfo.configContent,
       sarProStateListDatas: [], // 符合性项目列表数据
       sarProStateTableHeight: null, // 符合性项目列表高度
-      standId: "" // 符合性项目Id
+      productId: "" // 符合性项目Id
     };
   },
   methods: {
@@ -384,16 +384,18 @@ export default {
     }, // 外层清空条件查询
     handleProjectCompliance(row) {
       this.sarProStateEO.type = row.type
-      this.standId = row.standId;
+      this.productId = row.productId;
       this.querySarProStateZero();
     }, // 查看项目符合性
     querySarProStateZero(page) {
+      console.log(page)
       if (page) {
         this.sarProStateTotalPage = page
       } else {
         this.sarProStateTotalPage = 1;
       }
       var form = this.sarProStateEO;
+      console.log('395',form)
       // form.standId = this.standId
       form.current = this.sarProStateTotalPage;
       form.size = this.sarProStatePageSize;
@@ -416,15 +418,15 @@ export default {
     }, // 查询项目数据
     clearSearchProState() {
       this.sarProStateEO.productName = "";
-      this.sarProStateEO.standId = "";
+      this.sarProStateEO.productId = "";
       this.sarProStateTotalPage = 1;
       this.querySarProStateZero();
     }, // 清空条件查询
     clearSearchPro() {
       this.sarProStateEO.productName = "";
-      this.sarProStateEO.standId = "";
+      this.sarProStateEO.productId = "";
       this.showSarProStateModal = false;
-      this.standId = "";
+      this.productId = "";
     }, // 关闭查看事件
     pageProStateChange(page) {
       this.sarProStateTotalPage = page;

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/pages/searchCenter/pages/advancedSearch.vue

@@ -599,178 +599,244 @@
               <el-form :model="standForm" ref="standForm" label-position="right" label-width="150px">
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="企标类别" prop="nameShow">
+                    <el-form-item label="企标类别" prop="standSort">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据企标类别查找"
+                      <el-select v-model="standForm.standSort" filterable>
-                                @keyup.enter.native="btnSearch"></el-input>
+                        <el-option
+                                v-for="item in standSortOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="企标编号" prop="standNumber">
+                    <el-form-item label="企标编号" prop="standCode">
-                      <el-input v-model="standForm.standNumber" clearable
+                      <el-input v-model="standForm.standCode" clearable
-                                placeholder="根据企标编号查找"
+                                placeholder="请输入企标编号"
                                 @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="标准年份" prop="nameShow">
+                    <el-form-item label="标准年份" prop="standYear">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据标准年份查找"
+                      <el-input v-model.number="standForm.standYear" clearable placeholder="请输入标准年份"></el-input>
-                                @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="企标名称" prop="standNumber">
+                    <el-form-item label="企标名称" prop="standName">
-                      <el-input v-model="standForm.standNumber" clearable
+                      <el-input v-model="standForm.standName" clearable
-                                placeholder="根据企标名称查找"
+                                placeholder="请输入企标名称"></el-input>
-                                @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="企标英文名称" prop="nameShow">
+                    <el-form-item label="企标英文名称" prop="standEnName">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据企标英文名称查找"
+                      <el-input v-model="standForm.standEnName" clearable placeholder="请输入企标英文名称"></el-input>
-                                @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="文本状态" prop="standNumber">
+                    <el-form-item label="文本状态" prop="textStatusBuss">
-                      <el-input v-model="standForm.standNumber" clearable
+                      <el-select v-model="standForm.textStatusBuss"
-                                placeholder="根据文本状态查找"
+                                 placeholder="请选择文本状态"
-                                @keyup.enter.native="btnSearch"></el-input>
+                                 clearable>
+                        <el-option
+                                v-for="opt in textStatusOptions"
+                                :key="opt.value"
+                                :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
+                        >
+                          {{ opt.label }}
+                        </el-option>
+                      </el-select>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="废止日期" prop="nameShow">
+                    <el-form-item label="发布日期" class="add-form-item form-item-disabled">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据废止日期查找"
+                      <el-datePicker v-model="standForm.issueTime"
-                                @keyup.enter.native="btnSearch"></el-input>
+                                     :editable="false"
+                                     placeholder="请选择发布日期"
+                                     value-format="yyyy-MM-dd"
+                                     clearable></el-datePicker>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="企标实施日期" prop="standNumber">
+                    <el-form-item label="实施日期" title="标准实施日期" class="add-form-item form-item-disabled">
-                      <el-input v-model="standForm.standNumber" clearable
+                      <el-datePicker v-model="standForm.putTime"
-                                placeholder="根据企标实施日期查找"
+                                     :editable="false"
-                                @keyup.enter.native="btnSearch"></el-input>
+                                     placeholder="请选择实施日期"
+                                     value-format="yyyy-MM-dd"
+                                     clearable
+                      ></el-datePicker>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="企标发布日期" prop="nameShow">
+                    <el-form-item label="废止日期" prop="FZRQBUSS">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据企标发布日期查找"
+                      <el-datePicker v-model="standForm.FZRQBUSS"
-                                @keyup.enter.native="btnSearch"></el-input>
+                                     :editable="false"
+                                     placeholder="请选择废止日期"
+                                     value-format="yyyy-MM-dd"
+                                     clearable
+                      ></el-datePicker>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="复审日期" prop="standNumber">
+                    <el-form-item label="复审日期" prop="FSRQBUSS">
-                      <el-input v-model="standForm.standNumber" clearable
+                      <el-datePicker v-model="standForm.FSRQBUSS"
-                                placeholder="根据复审日期查找"
+                                     :editable="false"
-                                @keyup.enter.native="btnSearch"></el-input>
+                                     placeholder="请选择复审日期"
+                                     value-format="yyyy-MM-dd"
+                                     clearable
+                      ></el-datePicker>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="起草部门" prop="nameShow">
+                    <el-form-item label="起草部门" prop="QCDW">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据起草部门查找"
+                      <el-select v-model="standForm.QCDW" filterable clearable>
-                                @keyup.enter.native="btnSearch"></el-input>
+                        <el-option
+                                v-for="item in qcdwOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="起草人" prop="standNumber">
-                      <el-input v-model="standForm.standNumber" clearable
+                      <el-select v-model="standForm.QCRBUSS" filterable clearable>
-                                placeholder="根据起草人查找"
+                        <el-option
-                                @keyup.enter.native="btnSearch"></el-input>
+                                v-for="item in qcrOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
+<!--                  <el-col :span="12">-->
-                    <el-form-item label="文件上传人员" prop="nameShow">
+<!--                    <el-form-item label="文件上传人员" prop="nameShow">-->
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据文件上传人员查找"
+<!--                      <el-input v-model="standForm.nameShow" clearable></el-input>-->
-                                @keyup.enter.native="btnSearch"></el-input>
+<!--                    </el-form-item>-->
-                    </el-form-item>
+<!--                  </el-col>-->
-                  </el-col>
                   <el-col :span="12">
                     <el-form-item label="适用车型" prop="standNumber">
-                      <el-input v-model="standForm.standNumber" clearable
+                      <el-select v-model="standForm.SYCXCLASS" filterable clearable>
-                                placeholder="根据适用车型查找"
+                        <el-option
-                                @keyup.enter.native="btnSearch"></el-input>
+                                v-for="item in applyArcticOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="能源类型" prop="NYLXCLASS">
+                      <el-select v-model="standForm.NYLXCLASS" filterable clearable>
+                        <el-option
+                                v-for="item in categoryOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row type="flex" justify="space-around" class="code-row-bg">
+
+                  <el-col :span="12">
+                    <el-form-item label="适用产品线" prop="SYCPXCLASS">
+                      <el-select v-model="standForm.SYCPXCLASS" filterable clearable>
+                        <el-option
+                                v-for="item in sycpxOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="体系类别" prop="TXLBBUSS">
+                      <el-input v-model="standForm.TXLBBUSS" placeholder="选择体系类别" @click.native="choiceZRRTxlbBuss('TXLBBUSS', '体系类别', standForm.TXLBBUSS)"></el-input>
+                      <tree-select-new
+                              width = "800"
+                              :key="keyBuss"
+                              :multiple=false
+                              :lazy=false
+                              :check-strictly= true
+                              :modalShowFlag="modalShowFlagBuss"
+                              :drawerTitle="drawerTitle"
+                              :show-checkBox="showCheckBox"
+                              :data="standSystemBussOptions"
+                              :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
+                              :nodeKey="nodeKey" @popoverHide="popoverBuss"></tree-select-new>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row type="flex" justify="space-around" class="code-row-bg">
+
+                  <el-col :span="12">
+                    <el-form-item label="关联模块-VPPS编码" prop="VPPSBMBUSS">
+                      <el-input v-model="standForm.VPPSBMBUSS" clearable
+                                placeholder="请输入关联模块-VPPS编码查找"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="关联模块-中文名称" prop="VPPSCNBUSS">
+                      <el-input v-model="standForm.VPPSCNBUSS" clearable
+                                placeholder="请输入关联模块-中文名称查找"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
-                    <el-form-item label="能源类型" prop="nameShow">
+                    <el-form-item label="代替企标编号" prop="DTQBBHBUSS">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据能源类型查找"
+                      <el-input v-model="standForm.DTQBBHBUSS" clearable placeholder="请输入代替企标编号查找"></el-input>
-                                @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="适用产品线" prop="standNumber">
+                    <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS">
-                      <el-input v-model="standForm.standNumber" clearable
+                      <el-input v-model="standForm.BDTQBBHBUSS" clearable placeholder="请输入被代替企标编号查找"></el-input>
-                                placeholder="根据适用产品线查找"
-                                @keyup.enter.native="btnSearch"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
+
-                    <el-form-item label="体系类别" prop="nameShow">
+<!--                  <el-col :span="12">-->
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据体系类别查找"
+<!--                    <el-form-item label="宣贯记录" prop="standNumber">-->
-                                @keyup.enter.native="btnSearch"></el-input>
+<!--                      <el-input v-model="standForm.standNumber" clearable-->
-                    </el-form-item>
+<!--                                placeholder="根据宣贯记录查找"-->
-                  </el-col>
+<!--                                @keyup.enter.native="btnSearch"></el-input>-->
-                  <el-col :span="12">
+<!--                    </el-form-item>-->
-                    <el-form-item label="关联模块-VPPS编码" prop="standNumber">
+<!--                  </el-col>-->
-                      <el-input v-model="standForm.standNumber" clearable
+<!--                </el-row>-->
-                                placeholder="根据关联模块-VPPS编码查找"
+<!--                <el-row type="flex" justify="space-around" class="code-row-bg">-->
-                                @keyup.enter.native="btnSearch"></el-input>
+<!--                  <el-col :span="12">-->
-                    </el-form-item>
+<!--                    <el-form-item label="上传时间" prop="nameShow">-->
-                  </el-col>
+<!--                      <el-input v-model="standForm.nameShow" clearable placeholder="根据上传时间查找"-->
-                </el-row>
+<!--                                @keyup.enter.native="btnSearch"></el-input>-->
-                <el-row type="flex" justify="space-around" class="code-row-bg">
+<!--                    </el-form-item>-->
-                  <el-col :span="12">
+<!--                  </el-col>-->
-                    <el-form-item label="代替企标编号" prop="nameShow">
+<!--                  <el-col :span="12">-->
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据代替企标编号查找"
+<!--                  </el-col>-->
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="关联模块-中文名称" prop="standNumber">
-                      <el-input v-model="standForm.standNumber" clearable
-                                placeholder="根据关联模块-中文名称查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
-                    <el-form-item label="被代替企标编号" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据被代替企标编号查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="宣贯记录" prop="standNumber">
-                      <el-input v-model="standForm.standNumber" clearable
-                                placeholder="根据宣贯记录查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
-                    <el-form-item label="上传时间" prop="nameShow">
-                      <el-input v-model="standForm.nameShow" clearable placeholder="根据上传时间查找"
-                                @keyup.enter.native="btnSearch"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                  </el-col>
                 </el-row>
               </el-form>
             </div>
@@ -919,10 +985,10 @@
                 <el-table-column
                   align="center"
                   width="180"
-                  :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '企业标准状态')">
+                  :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
                   <template slot-scope="scope">
                     <div>
-                      {{ scope.row.standstateshow }}
+                      {{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
                     </div>
                   </template>
                 </el-table-column>
@@ -1072,6 +1138,7 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowFlagBuss: false, // drawer开关
       url:'',
       urlChild:'',
       drawerTitle: '', //drawer标题
@@ -1097,6 +1164,7 @@ export default {
       key1:2,
       key2:3,
       key3:4,
+      keyBuss:5,
       nodeKey: 'id',
       defaultCheckedKeys: [],
       nodeKeyCode: 'code',
@@ -1248,6 +1316,7 @@ export default {
       // 国家/地区
       countryOptions: [],
       standSystemOptions: [], // 标准体系
+      standSystemBussOptions: [], // 企标体系
       busVppsOptions: [], // 车系体系架构
       busVppsChildOptions: [], // 车系体系架构子集合
       modelOptions: [], // 模块体系架构
@@ -1259,6 +1328,11 @@ export default {
       txlbOptions: [], // 体系类别
       // 标准类别
       standSortOptions: [],
+      textStatusOptions: [],
+      qcdwOptions:[],//起草单位下拉框
+      qcrOptions:[],//起草人下拉框
+      nylxOptions:[],//能源类型下拉框
+      syrzOptions:[],//适用认证下拉框
       // 我司署名人
       wssmrOptions: [],
       // 体系类别
@@ -1331,11 +1405,19 @@ export default {
                       // 国内外标准
                       const inlandList = data['INLAND_STAND'] || []
                       const foreignList = data['FOREIGN_STAND'] || []
+                      const bussList = data['BUSS'] || []
                       const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB');
-                      this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList);
+                      const bussFilterList = bussList.filter ( item => item.attrField !== 'QCDW' && item.attrField !== 'XGLC');
+                      this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList).concat(bussFilterList);
+                    console.log(this.formFieldListStandData)
                   }
               }, e => {})
       },
+    choiceZRRTxlbBuss (type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlagBuss = true
+      this.keyBuss++
+    },
     choiceZRR1 (type, title, id) {
       this.drawerTitle = title
       this.modalShowFlag1 = true
@@ -1368,6 +1450,17 @@ export default {
       this.urlChild="sarModelTree/childByList"
       this.key3++
     },
+    popoverBuss (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData) {
+        if(checkedData.length > 0){
+          this.standForm.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
+        }else {
+          this.standForm.TXLBBUSS = checkedData.menuName
+        }
+      }
+      this.modalShowFlagBuss = false
+      this.$forceUpdate()
+    },
     popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
       if(checkedData) {
         if(checkedData.length > 0){
@@ -1725,7 +1818,7 @@ export default {
       const formFieldList = this.formFieldListStandData
       const sarStandAttrObj = {}
       formFieldList.forEach((item) => {
-         const attrField = item.attrField.toLowerCase();
+         const attrField = this.selectIndex === 'INLAND_STAND' ? item.attrField.toLowerCase() : item.attrField;
          const value = nowStandForm[attrField]
           // 时间格式处理
           if (item.attrType === 'DATE_PICKER' && value) {
@@ -1904,20 +1997,8 @@ export default {
           });
         }
       } else {
-        if (this.$hasPermission("AMFQKB2GCPSJ5YVPPHG6")) {
           routername = "OtherBussStandardDetails";
           pagetype = "BUSINESS_STAND ";
-          // this.judgeBussRole(item)
-          // if (this.bussRoleFlag === false) {
-          //   this.$message.error('当前角色无权限查看此信息')
-          // } else {
-          // }
-        } else {
-          this.$message({
-            message: "无权访问",
-            type: "warning"
-          });
-        }
       }
       // 详情跳到新页
       if (routername !== "") {
@@ -2360,6 +2441,7 @@ export default {
       this.standNatureOptions = res.data.SARPROPERTY // 标准性质
       this.standStateOptions = res.data.WBZTCLASS // 文本状态
       this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+      this.standSystemBussOptions = res.data.TXLBBUSS // 企标体系
       this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型”
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
@@ -2377,6 +2459,10 @@ export default {
       this.bussBigClassOptions = res.data.BUSSBIGCLASS;
       this.bussStandClassOptions = res.data.BUSSSTANDCLASS;
       this.regionOptions = res.data.REGION; // 区域
+      this.textStatusOptions = res.data.TEXTSTATUSBUSS // 文本状态
+      this.qcdwOptions = res.data.QCDW // 起草单位
+      this.qcrOptions = res.data.QCRBUSS // 起草人
+      this.syrzOptions = res.data.SYRZCLASS // 适用认证
     }, e => {
     });
     // 根据资源类型过滤表头

src/pages/searchCenter/pages/standardSearch.vue

@@ -877,9 +877,9 @@
                                 } else if (this.selectIndex === 'laws' && seniortype[i] === 'CYSD') {
                                     renameType = 'WSSFCY'
                                 } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'ORGLIST'){
-                                    renameType = 'ZQCBM'
+                                    renameType = 'QCDW'
                                 } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'BUSSSTATE'){
-                                    renameType = 'statecode'
+                                    renameType = 'textStatusBuss'
                                 }
                                 else {
                                     renameType = seniortype[i]
@@ -1136,11 +1136,11 @@
                         // 企业标准
                         case 'enterprise':
                             //标准状态
-                            filterOptions.BUSSSTATE = originOptions.BUSSSTATE
+                            filterOptions.BUSSSTATE = originOptions.TEXTSTATUSBUSS
-                            filterOptions.BUSSSTATE.title = '标准状态'
+                            filterOptions.BUSSSTATE.title = '文本状态'
                             filterOptions.BUSSSTATE.index = 1
                             //主起草部门
-                            filterOptions.ORGLIST = originOptions.ORGLIST
+                            filterOptions.ORGLIST = originOptions.QCDW
                             filterOptions.ORGLIST.title = '主起草部门'
                             filterOptions.ORGLIST.index = 2
                             break
@@ -1264,8 +1264,8 @@
                 }
                 if(condition.selectIndex === 'enterprise'){
                     condition.selectIndex='bussstand'
-                    condition.standState = condition.BUSSSTATE
+                    condition.textStatusBuss = condition.BUSSSTATE
-                    condition.ZQCBM = condition.ORGLIST
+                    condition.QCDW = condition.ORGLIST
                 }
                 // 查询为国内外政策时，改变查询参数名
                 if (condition.selectIndex === 'laws') {

src/router/index.js

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