Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

2021-07-19 17:23:53 +08:00
parent fddba323f3 0898e5c590
commit 9e315314bc
34 changed files with 521 additions and 266 deletions
@@ -9,13 +9,33 @@ export default {
      return {
          processTypeList: [
              {
-                  label: '标准入库流程',
+                  label: '标准调研流程',
+                  value: '2'
+              },
+              {
+                  label:'标准入库流程',
                  value: '1'
              },
-            {
-              label:'标准清单发布流程',
-              value: '3'
-            },
+              {
+                  label:'标准征求意见流程',
+                  value: '3'
+              },
+              {
+                  label:'标准清单发布/更新流程',
+                  value: '6'
+              },
+              {
+                  label: '项目合规评估流程',
+                  value: '7'
+              },
+              {
+                  label: '未符合项整改流程',
+                  value: '8'
+              },
+              {
+                  label: '标准解读流程',
+                  value: '9'
+              },
          ],
          formDisableFlag: false,
          pickerOptions: {
@@ -343,11 +343,11 @@ export default {
      var fileSuffix = filename.substring(index1, index2)
      // const fileSuffix = file.name.split('.')[1] // 后缀名
      // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
        return true
      } else {
        this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
        return false
      }
      // 判断文件上传大小
@@ -441,11 +441,12 @@ export default {
                      this.$message.success('流程发起成功')
                      this.$router.push('/processCenter')
                    }
+                    this.isSubmit = false
                  })
                } else {
+                  this.isSubmit = false
                  this.$message.warning('流程启动失败')
                }
-                this.isSubmit = false
              })
            } else {
              return this.$message.warning('请完善人员信息')
@@ -169,11 +169,11 @@
                var fileSuffix = filename.substring(index1, index2)
                // const fileSuffix = file.name.split('.')[1] // 后缀名
                // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                    return true
                } else {
                    this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                    return false
                }
                // 判断文件上传大小
@@ -193,11 +193,11 @@
                var fileSuffix = filename.substring(index1, index2)
                // const fileSuffix = file.name.split('.')[1] // 后缀名
                // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                    return true
                } else {
                    this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                    return false
                }
                // 判断文件上传大小
@@ -191,11 +191,11 @@
                var fileSuffix = filename.substring(index1, index2)
                // const fileSuffix = file.name.split('.')[1] // 后缀名
                // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                    return true
                } else {
                    this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                    return false
                }
                // 判断文件上传大小
@@ -191,11 +191,11 @@
                var fileSuffix = filename.substring(index1, index2)
                // const fileSuffix = file.name.split('.')[1] // 后缀名
                // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                    return true
                } else {
                    this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                    return false
                }
                // 判断文件上传大小
@@ -191,11 +191,11 @@
                var fileSuffix = filename.substring(index1, index2)
                // const fileSuffix = file.name.split('.')[1] // 后缀名
                // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                    return true
                } else {
                    this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                    return false
                }
                // 判断文件上传大小
@@ -191,11 +191,11 @@
                var fileSuffix = filename.substring(index1, index2)
                // const fileSuffix = file.name.split('.')[1] // 后缀名
                // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                    return true
                } else {
                    this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                    return false
                }
                // 判断文件上传大小
@@ -532,11 +532,15 @@
                                    ></el-input>
                                </el-form-item>
                                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.qcdw"
-                                            placeholder="请选择起草单位"
-                                            clearable
-                                    ></el-input>
+                                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                                        <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 v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                                    <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -1331,6 +1335,8 @@
                categoryOptions: [], // 能源类型
                applyAuthOptions: [], // 适用认证
                cysdOptions: [], // 我司参与深度
+                wssmrOptions: [], // 我司署名人
+                qcdwOptions: [], // 起草单位
                sycpxOptions: [], // 适用产品线
                zrbmOptions: [], // 责任部门
                zrgcsOptions: [], // 责任工程师
@@ -2011,6 +2017,8 @@
                this.categoryOptions = res.data.NYLXCLASS // 能源类型
                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
                this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.wssmrOptions = res.data.WSSMR // 我司署名人
+                this.qcdwOptions = res.data.QCDW // 我司署名人
                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
@@ -361,12 +361,15 @@
                                    ></el-input>
                                </el-form-item>
                                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.qcdw"
-                                            placeholder="请选择起草单位"
-                                            clearable
-                                    ></el-input>
+                                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
+                                        <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 v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                                    <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -437,8 +440,13 @@
                                </el-form-item>
                                <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                                        <el-option label="署名人1" value="1"></el-option>
-                                        <el-option label="署名人2" value="2"></el-option>
+                                        <el-option
+                                                v-for="item in wssmrOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
                                    </el-select>
                                </el-form-item>
                                <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -811,6 +819,8 @@
                categoryOptions: [], // 能源类型
                applyAuthOptions: [], // 适用认证
                cysdOptions: [], // 我司参与深度
+                wssmrOptions: [], // 我司署名人
+                qcdwOptions: [], // 起草单位
                sycpxOptions: [], // 适用产品线
                zrbmOptions: [], // 责任部门
                zrgcsOptions: [], // 责任工程师
@@ -1006,6 +1016,8 @@
                this.categoryOptions = res.data.NYLXCLASS // 能源类型
                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
                this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.wssmrOptions = res.data.WSSMR // 我司署名人
+                this.qcdwOptions = res.data.QCDW // 起草单位
                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
@@ -354,12 +354,15 @@
                  ></el-input>
                </el-form-item>
                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.qcdw"
-                      placeholder="请选择起草单位"
-                      clearable
-                  ></el-input>
+                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
+                        <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 v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                  <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -430,8 +433,13 @@
                </el-form-item>
                <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                    <el-option label="署名人1" value="1"></el-option>
-                    <el-option label="署名人2" value="2"></el-option>
+                      <el-option
+                              v-for="item in wssmrOptions"
+                              placeholder="请选择"
+                              :key="item.value"
+                              :value="item.value"
+                              :label="item.label"
+                      ></el-option>
                  </el-select>
                </el-form-item>
                <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -803,6 +811,8 @@ export default {
      categoryOptions: [], // 能源类型
      applyAuthOptions: [], // 适用认证
      cysdOptions: [], // 我司参与深度
+      wssmrOptions: [], // 我司署名人
+      qcdwOptions: [], // 起草单位
      sycpxOptions: [], // 适用产品线
      zrbmOptions: [], // 责任部门
      zrgcsOptions: [], // 责任工程师
@@ -994,6 +1004,8 @@ export default {
      this.categoryOptions = res.data.NYLXCLASS // 能源类型
      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
      this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.wssmrOptions = res.data.WSSMR // 我司署名人
+      this.qcdwOptions = res.data.QCDW // 起草单位
      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
@@ -519,11 +519,15 @@
                  ></el-input>
                </el-form-item>
                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-input
-                      v-model="form.qcdw"
-                      placeholder="请选择起草单位"
-                      clearable
-                  ></el-input>
+                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                        <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 v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                  <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -594,8 +598,13 @@
                </el-form-item>
                <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
-                    <el-option label="署名人1" value="1"></el-option>
-                    <el-option label="署名人2" value="2"></el-option>
+                      <el-option
+                              v-for="item in wssmrOptions"
+                              placeholder="请选择"
+                              :key="item.value"
+                              :value="item.value"
+                              :label="item.label"
+                      ></el-option>
                  </el-select>
                </el-form-item>
                <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -1173,6 +1182,8 @@ export default {
      categoryOptions: [], // 能源类型
      applyAuthOptions: [], // 适用认证
      cysdOptions: [], // 我司参与深度
+      wssmrOptions: [], // 我司署名人
+      qcdwOptions: [], // 起草单位
      sycpxOptions: [], // 适用产品线
      zrbmOptions: [], // 责任部门
      zrgcsOptions: [], // 责任工程师
@@ -1602,6 +1613,8 @@ export default {
      this.categoryOptions = res.data.NYLXCLASS // 能源类型
      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
      this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.wssmrOptions = res.data.WSSMR // 我司署名人
+      this.qcdwOptions = res.data.QCDW // 起草单位
      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
@@ -26,7 +26,7 @@
              <el-col :span="24">
                <el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
                  <div class="addButton">
-                    <el-button  size="small" type="primary" @click="addZqyjList">选择征求意见</el-button>
+                    <el-button  size="small" type="primary" @click="addZqyjList">选择标准</el-button>
                  </div>
                </el-form-item>
                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
@@ -164,46 +164,46 @@
    >
    </ProcessFooter>
    <el-drawer
-      title="标准征求意见数据库"
+      title="标准库"
      :visible.sync="listModel"
      size="900px"
      custom-class="demo-drawer"
    >
      <div class="standardForComments">
-
        <div class="content">
          <!-- 顶部工具栏 -->
          <table-tools-bar>
            <div slot="left">
              <div class="search-area">
-<!--                <el-form :model="standCommonlySearch" inline class="label-input-form">-->
-<!--&lt;!&ndash;                  <el-formItem label="类别" class="search-item">&ndash;&gt;-->
-<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>&ndash;&gt;-->
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-<!--&lt;!&ndash;                  <el-formItem label="关键字" class="search-item">&ndash;&gt;-->
-<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>&ndash;&gt;-->
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-<!--&lt;!&ndash;                  <el-formItem label="开始日期" class="search-item">&ndash;&gt;-->
-<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.start" :editable="false"&ndash;&gt;-->
-<!--&lt;!&ndash;                                   placeholder="请选择开始日期"></el-datePicker>&ndash;&gt;-->
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-<!--&lt;!&ndash;                  <el-formItem label="结束日期" class="search-item">&ndash;&gt;-->
-<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.end" :editable="false"&ndash;&gt;-->
-<!--&lt;!&ndash;                                   placeholder="请选择结束日期"></el-datePicker>&ndash;&gt;-->
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-<!--                  <el-formItem class="search-item btn-box">-->
-<!--                    <el-button-->
-<!--                            type="primary"-->
-<!--                            size="mini"-->
-<!--                            class="common-button-primary"-->
+                <el-form :model="standCommonlySearch" inline class="label-input-form">
+                  <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
+                    <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
+                  </el-formItem>
+                  <el-formItem label="标准类别" prop="standSort" class="search-item">
+                    <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
+                      <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-formItem>
+                  <el-formItem label="标准来源" prop="standType" class="search-item">
+                    <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
+                      <el-option value="INLAND" key="1" label="国内标准"></el-option>
+                      <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                    </el-select>
+                  </el-formItem>
+                  <el-formItem class="search-item btn-box">
+                    <el-button
+                            type="primary"
+                            size="mini"
+                            class="common-button-primary"

-<!--                            @click="sarStandCompareHisInfo">查询</el-button>-->
-<!--                    <el-button-->
-<!--                            class="common-button-default"-->
-<!--                            size="mini"-->
-<!--                            @click="clearSearchStand">清空</el-button>-->
-<!--                  </el-formItem>-->
-<!--                </el-form>-->
+                            @click="sarStandCompareHisInfo">查询</el-button>
+                    <el-button
+                            class="common-button-default"
+                            size="mini"
+                            @click="clearSearchStand">清空</el-button>
+                  </el-formItem>
+                </el-form>
              </div>
            </div>
          </table-tools-bar>
@@ -332,10 +332,9 @@ export default {
      },
      // 标准征求意见数据可库
      standCommonlySearch: {
-        // categorg: '',
-        // cname: '',
-        // start: '',
-        // end: '',
+        standSort: '',
+        standNumber: '',
+        standType: '',
        page: 1,
        pageSize: this.$store.getters.userInfo.configContent
      },
@@ -383,6 +382,7 @@ export default {
        label: 'name'
      },
      roleRow: {},
+      standSortOptions: [],
    }
  },
  components: {
@@ -393,6 +393,12 @@ export default {
  mounted () {
    this.getTree()
    this.sarStandCompareHis()
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+    }, e => {
+    })
    this.tableHeight = $('.content').height() - 44
    window.onresize = () => {
      this.tableHeight = $('.content').height() - 44
@@ -408,15 +414,14 @@ export default {
    // 清空
    clearSearchStand () {
      this.standCommonlySearch.page = 1
-      this.standCommonlySearch.start = ''
-      this.standCommonlySearch.end = ''
-      this.standCommonlySearch.categorg = ''
-      this.standCommonlySearch.cname = ''
+      this.standCommonlySearch.standSort = ''
+      this.standCommonlySearch.standNumber = ''
+      this.standCommonlySearch.standType = ''
      this.sarStandCompareHis()
    },
    // 搜索
    sarStandCompareHisInfo() {
-      this.splitInfoPage = 1
+      this.standCommonlySearch.page = 1
      this.sarStandCompareHis()
    },
    // 查询表格
@@ -234,7 +234,7 @@
            handleSave() {},
            handleSubmit() {
                if (this.data.length < 1) {
-                    this.$message.warning('请输入征求意见搞')
+                    this.$message.warning('请输入征求意见')
                } else {
                    var a = 0
                    var b = 0
@@ -209,9 +209,6 @@
                    return '处理后上报'
                }
            },
-            upload (row) {
-                console.log(row);
-            },
            handleTabs(name) {
                this.active = name
            },
@@ -209,9 +209,6 @@
                    return '处理后上报'
                }
            },
-            upload (row) {
-                console.log(row);
-            },
            handleTabs(name) {
                this.active = name
            },
@@ -209,9 +209,6 @@
                    return '处理后上报'
                }
            },
-            upload (row) {
-                console.log(row);
-            },
            handleTabs(name) {
                this.active = name
            },
@@ -7,8 +7,8 @@
        <div class="process-name" @click="handleCreateProcess('2')">标准调研流程</div>
        <div class="process-name" @click="handleCreateProcess('1')">标准入库流程</div>
        <div class="process-name" @click="handleCreateProcess('3')">标准征求意见流程</div>
-        <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>
-        <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>
+<!--        <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>-->
+<!--        <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>-->
        <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
        <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
        <div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>