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

src/components/CustomFormComponents/InputForStandards.vue

@@ -361,7 +361,7 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0,
-        standType: 'INLAND',
+        standType: 'ALL',
         quoteIdList: '',
         validFlag: '0'
       }

src/components/CustomFormComponents/InputForStandardsForForeign.vue

@@ -329,7 +329,7 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0,
-        standType: 'FOREIGN',
+        standType: 'ALL',
         quoteIdList: '',
         validFlag: '0'
       }

src/components/navMenu/index.vue

@@ -434,7 +434,7 @@ export default {
   },
   computed: {
     logo () {
-      return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo2.png')
+      return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png')
     },
     ...mapGetters(['getDynamicTotal', 'isCollapse'])
   },
@@ -458,7 +458,7 @@ export default {
     overflow-y: auto;
     user-select: none;
     box-sizing: border-box;
-    background: url("~assets/images/shangqi/sideBar/side-bar-isCollapse-bg.png") no-repeat;
+    background: url("~assets/images/shangqi/sideBar/newside-bar-bg1.png") no-repeat;
     background-size: 100% 100%;
     &:not(.is-collapse) {
       width: 212px;

src/components/treeSelect/treeSelectNew.vue

@@ -6,6 +6,7 @@
             :size="width"
             :append-to-body=true
             :before-close="cancelUserInfo"
+            :show-checkbox="showCheckBox"
             >
         <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
                  :load="loadNode"
@@ -111,6 +112,12 @@
                     return '';
                 }
             },
+          showCheckBox:{
+                type: Boolean,
+                default () {
+                    return true;
+                }
+            },
             // 配置是否展开
             modalShowFlag: {
                 type: Boolean,

src/pages/config/pages/linkManage/index.vue

@@ -48,8 +48,10 @@
                         width="220px">
                 </el-table-column>
                 <el-table-column
-                        prop="url"
                         label="链接">
+                  <template slot-scope="scope" >
+                    <span @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">{{ scope.row.url }}</span>
+                  </template>
                 </el-table-column>
                 <el-table-column
                         label="操作"
@@ -149,6 +151,10 @@
             }
         },
         methods: {
+          //链接点击跳转,链接形式为http://xxxxxx
+          linkto(link_href){
+            window.open(link_href)
+          },
             //头部新增按钮
             addLink () {
                 this.type = 1
@@ -157,33 +163,46 @@
             },
             //表格中操作列删除操作弹窗
             deleteLink (row) {
+              this.$confirm('此操作将删除该链接, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+
                 this.$http.delete('sarUrl/tsUrl/delete', {
-                    id: row.id
+                  id: row.id
                 }, {
-                    _this: this,
-                    loading: 'Loading'
+                  _this: this,
+                  loading: 'Loading'
                 }, res => {
-                    if (res.ok) {
-                        this.$message.success('删除成功')
-                        let arr = []
-                        for (let a = 0; a < this.linkList.length; a++) {
-                            if (this.linkList[a].id === row.id) {
-                                this.linkList.splice(a, 1)
-                            }
-                        }
-                        this.linkList.forEach((item, index) => {
-                            let json = {}
-                            json.id = item.id
-                            json.orderBy = index + 1
-                            arr.push(json)
-                        })
-                        this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
-                            this.getLink()
-                        })
-                    }else {
-                        this.$message.warning(res.message)
+                  if (res.ok) {
+                    this.$message.success('删除成功')
+                    let arr = []
+                    for (let a = 0; a < this.linkList.length; a++) {
+                      if (this.linkList[a].id === row.id) {
+                        this.linkList.splice(a, 1)
+                      }
                     }
+                    this.linkList.forEach((item, index) => {
+                      let json = {}
+                      json.id = item.id
+                      json.orderBy = index + 1
+                      arr.push(json)
+                    })
+                    this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
+                      this.getLink()
+                    })
+                  }else {
+                    this.$message.warning(res.message)
+                  }
                 })
+              }).catch(() => {
+                this.$message({
+                  type: 'info',
+                  message: '已取消删除'
+                });
+              });
+
             },
             //头部删除按钮
             deleteAllLink() {
@@ -196,28 +215,39 @@
                     this.$message.warning('请选择要删除的链接')
                 } else {
                     this.modalRole = true
+                  this.$confirm('此操作将删除链接, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                  }).then(() => {
                     this.$http.delete('sarUrl/tsUrl/deleteBatch', {
-                        ids: this.ids
+                      ids: this.ids
                     }, {}, res => {
-                        if (res.ok) {
-                            this.$message.success('删除成功')
-                            let arr = this.linkList.filter(items => {
-                                if (!this.ids.includes(items.id)) return items;
-                            })
-                            let newArr = []
-                            arr.forEach((item, index) => {
-                                let json = {}
-                                json.id = item.id
-                                json.orderBy = index + 1
-                                newArr.push(json)
-                            })
-                            this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
-                                this.getLink()
-                            })
-                        }else {
-                            this.$message.warning(res.message)
-                        }
+                      if (res.ok) {
+                        this.$message.success('删除成功')
+                        let arr = this.linkList.filter(items => {
+                          if (!this.ids.includes(items.id)) return items;
+                        })
+                        let newArr = []
+                        arr.forEach((item, index) => {
+                          let json = {}
+                          json.id = item.id
+                          json.orderBy = index + 1
+                          newArr.push(json)
+                        })
+                        this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
+                          this.getLink()
+                        })
+                      }else {
+                        this.$message.warning(res.message)
+                      }
                     })
+                  }).catch(() => {
+                    this.$message({
+                      type: 'info',
+                      message: '已取消删除'
+                    });
+                  });
                 }
             },
             //弹窗关闭操作

src/pages/config/pages/postManage/index.vue

@@ -147,7 +147,8 @@
                 },
                 sarStandardsInfoRules: {
                     name: [
-                        { required: true, message: '请输入岗位名称', trigger: 'blur' }
+                        { required: true, message: '请输入岗位名称', trigger: 'blur' },
+                        { min: 0, max: 100, message: '长度应不超过100个字符', trigger: 'blur' }
                     ]
                 },
                 modalRole: false,

src/pages/details/otherStandardDetails/index.vue

@@ -65,14 +65,14 @@
           </template>
           <template
             v-for="(child, childIndex) in item.half"
-            v-if="child.isShowImp === '0'"
+            v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
           >
 <!--            代替标准编号-->
             <div
               :key="child.id"
               class="modular-item"
               :class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''"
-              v-if="child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH'"
+              v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' "
             >
               <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
               <span
@@ -189,19 +189,113 @@
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
-                  <el-button
-                      @click="showItemsModel(child.attrField)"
-                      class="decomposition-btn"
-                      icon="icon-separate"
-                  >标准分解单</el-button>
+<!--                  <el-button-->
+<!--                      @click="showItemsModel(child.attrField)"-->
+<!--                      class="decomposition-btn"-->
+<!--                      icon="icon-separate"-->
+<!--                  >标准分解单</el-button>-->
                 </p>
               </div>
             </div>
 
           </template>
+            <template
+                    v-for="(child, childIndex) in item.one"
+                    v-if="child.isShowImp === '0' && (item.label !== '关联信息' && (item.label !== '实施日期' && child.attrField !== 'SSRQGJ' && child.attrField !== 'ZCCSSRQGJ' && child.attrField !== 'XCXSSRQGJ' || (childIndex < 6 || item.showAll)) || item.label === '适用范围')"
+            >
+                <div
+                        :key="child.id"
+                        class="modular-item"
+                >
+                    <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                    <!--相关流程-->
+                    <template v-if="child.attrField === 'XGLC' && child.value">
+                        <p class="modular-content-p-val">
+                  <span v-for="(item, index) in child.value.split(',')" :key="index">
+                  <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
+                </span>
+                        </p>
+                    </template>
+                    <template
+                            v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
+                    >
+                        <p class="modular-content-p-val" v-if="child.value">
+                  <span v-for="(item, index) in child.value.split(',')" :key="index">
+                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
+                  </span>
+                        </p>
+                        <span class="modular-content-p-val" v-else>-</span>
+                    </template>
+                    <span
+                            v-else-if="child.attrField === 'SVPPS'"
+                            class="modular-content-p-val"
+                            :title="child.tips || '-'"
+                    >
+                {{ !child.value || child.value === 'null' ? '-' : child.value }}
+              </span>
+                    <span
+                            v-else-if="child.attrType !== 'FILE'"
+                            class="modular-content-p-val"
+                            :title="child.value || '-'"
+                    >
+                {{ child.value || '-' }}
+              </span>
+                    <div v-else class="modular-content-p-flies">
+                        <p
+                                class="files-title"
+                                v-for="(file, fileIndex) in child.value"
+                                :key="fileIndex"
+                        >
+                            <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
+                            <!--发布稿、增补件单独设置下载权限-->
+                            <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
+                  || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
+                  || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
+                                <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                                <i
+                                        title="下载"
+                                        @click="downloadFile(file.id)"
+                                        class="icon-download"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+                                />
+                                <i
+                                        title="下载带水印"
+                                        @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                        class="icon-download2"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+                                />
+                                <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
+                            </template>
+                            <template v-else>
+                                <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                                <i
+                                        title="下载"
+                                        @click="downloadFile(file.id)"
+                                        class="icon-download"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+                                />
+                                <i
+                                        title="下载带水印"
+                                        @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                        class="icon-download2"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+                                />
+                                <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
+                            </template>
+                        </p>
+                        <!--                <el-button-->
+                        <!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+                        <!--                  @click="showItemsModel(child.attrField)"-->
+                        <!--                  class="decomposition-btn"-->
+                        <!--                  icon="icon-separate"-->
+                        <!--                >标准分解单</el-button>-->
+                    </div>
+                </div>
+
+            </template>
           <template
-            v-for="(child, childIndex) in item.one"
-            v-if="child.isShowImp === '0' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
+            v-for="(child, childIndex) in item.child"
+            v-if="child.isShowImp === '0' && item.label !== '实施日期' && item.label !== '适用范围'"
           >
             <div
               :key="child.id"
@@ -217,7 +311,7 @@
                 </p>
               </template>
               <template
-                v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ'"
+                v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
               >
                 <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
@@ -283,12 +377,12 @@
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>
-                <el-button
-                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
-                  @click="showItemsModel(child.attrField)"
-                  class="decomposition-btn"
-                  icon="icon-separate"
-                >标准分解单</el-button>
+<!--                <el-button-->
+<!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+<!--                  @click="showItemsModel(child.attrField)"-->
+<!--                  class="decomposition-btn"-->
+<!--                  icon="icon-separate"-->
+<!--                >标准分解单</el-button>-->
               </div>
             </div>
 
@@ -404,27 +498,23 @@
             show-overflow-tooltip
             prop="itemsNum"
             label="条款号"
-            width="150"
           >
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="itemsName"
             label="条款名称"
-            width="150"
             >
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="itemsName"
               label="条款内容"
-              width="150"
           >
           </el-table-column>
           <el-table-column
             prop="termsConditions"
             label="解读内容"
-            width="250"
             show-overflow-tooltip
             :resizable="false"
           >
@@ -433,28 +523,28 @@
             </template>
           </el-table-column>
           <el-table-column
-              show-overflow-tooltip
-              prop="putTime"
-              label="实施日期"
-              width="150"
-          >
+              prop="XCXSSRQ"
+              label="新车型实施日期(文本)"
+              width="180">
+          </el-table-column>
+          <el-table-column
+              prop="ZCCSSRQ"
+              label="在产车实施日期(文本)"
+              width="180">
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="putTime"
               label="适用车型"
-              width="150"
           >
           </el-table-column>
           <el-table-column
             prop="responsibleUnitShow"
-            label="责任部门"
-            width="150">
+            label="责任部门">
           </el-table-column>
           <el-table-column
             prop="zrgcs"
-            label="责任工程师"
-            width="150">
+            label="责任工程师">
           </el-table-column>
           <el-table-column
             prop="dutyEngineerShow"
@@ -464,13 +554,11 @@
           <el-table-column
             show-overflow-tooltip
             prop="svppsShow"
-            label="符合性状态"
-            width="150">
+            label="符合性状态">
           </el-table-column>
           <el-table-column
             prop="applyArcticShow"
-            label="合规性分析"
-            width="150">
+            label="合规性分析">
           </el-table-column>
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">
@@ -1267,6 +1355,9 @@ export default {
   },
   watch: {},
   methods: {
+    FormatDate(date){
+        return moment(date).format('YYYY-MM-DD');
+    },
     // 将文本状态的id与name对应
     setMap(data){
       data.forEach(item => {
@@ -2170,7 +2261,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
           this.$message.error('请选择要下载的文件')
         }
@@ -2703,8 +2794,8 @@ export default {
         location.half = half
         location.showAll = false
       })
-      this.$http.get('sarSarAccessInfo/sar-sar-access-info/selectProTimeInfoByStandId', {
-        standId: this.$route.params.id
+      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
+        id: this.$route.params.id
       }, {
         _this: this
       }, res => {
@@ -2721,7 +2812,7 @@ export default {
           }
         })
         this.dynamicFormField = displayLocation
-        console.log(this.dynamicFormField)
+          console.log(this.dynamicFormField)
       })
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false

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

@@ -146,7 +146,6 @@
             </div>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -328,11 +327,11 @@
                 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                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,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -318,11 +318,11 @@ export default {
       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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+      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,PDF文件或图片')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
         return false
       }
       // 判断文件上传大小

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

@@ -147,7 +147,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -237,11 +236,11 @@
                 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                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,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -135,7 +135,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"

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

@@ -174,7 +174,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -261,11 +260,11 @@
                 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                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,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小

src/pages/processCenter/pages/creatProcess/bzdy/step6.vue

@@ -259,11 +259,11 @@
                 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                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,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -259,11 +259,11 @@
                 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                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,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -259,11 +259,11 @@
                 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                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,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小

src/pages/processCenter/pages/creatProcess/bzdy/step9.vue

@@ -259,11 +259,11 @@
                 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                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,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -165,7 +165,7 @@
                                         <el-input
                                                 v-model="roleForm.deptUserIdName"
                                                 placeholder="选择标准法规部部长"
-                                                @click.native="choiceZRR('deptUserId', '选择标准法规部部长', roleForm.deptUserId)"
+                                                @click.native="choiceZRRS(roleForm.deptUserId, 0, '')"
                                         />
                                     </div>
                                 </el-form-item>
@@ -313,58 +313,63 @@
                 </div>
             </div>
         </el-drawer>
-        <el-drawer
-                :title="drawerTitle"
-                :visible.sync="modalshowflag"
-                :wrapperClosable="false"
-                size="800px">
-            <el-tree
-                    v-if="modalshowflag"
-                    node-key="id"
-                    style="height: 100%; overflow: auto;"
-                    class="filter-tree"
-                    :data="treeData"
-                    :props="defaultProps"
-                    :default-checked-keys="nodeList"
-                    highlight-current
-                    check-strictly
-                    @check="drawerCheck"
-                    default-expand-all
-                    :expand-on-click-node="false"
-                    show-checkbox
-                    ref="tree">
-            </el-tree>
-            <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-            </div>
-        </el-drawer>
-        <el-drawer
-                title="选择责任部门对接人"
-                :visible.sync="modalshowflag2"
-                :wrapperClosable="false"
-                size="800px">
-            <el-tree
-                    v-if="modalshowflag2"
-                    node-key="id"
-                    style="height: 100%; overflow: auto;"
-                    class="filter-tree"
-                    :data="treeData"
-                    :props="defaultProps"
-                    :default-checked-keys="nodeList2"
-                    highlight-current
-                    check-strictly
-                    @check="drawerCheck2"
-                    default-expand-all
-                    :expand-on-click-node="false"
-                    show-checkbox
-                    ref="tree2">
-            </el-tree>
-            <div id="roleFormButton2" class="demo-drawer-footer">
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
-            </div>
-        </el-drawer>
+        <Role-tree
+                check-box
+                :is-title="drawerTitle"
+                :is-visible.sync="modalshowflag"
+                @checkedRole="saveUserInfo"
+                :nodeList="nodeList"
+        ></Role-tree>
+<!--        <el-drawer-->
+<!--                :title="drawerTitle"-->
+<!--                :visible.sync="modalshowflag"-->
+<!--                :wrapperClosable="false"-->
+<!--                size="800px">-->
+<!--            <el-tree-->
+<!--                    v-if="modalshowflag"-->
+<!--                    node-key="id"-->
+<!--                    style="height: 100%; overflow: auto;"-->
+<!--                    class="filter-tree"-->
+<!--                    :data="treeData"-->
+<!--                    :props="defaultProps"-->
+<!--                    :default-checked-keys="nodeList"-->
+<!--                    highlight-current-->
+<!--                    check-strictly-->
+<!--                    @check="drawerCheck"-->
+<!--                    :expand-on-click-node="false"-->
+<!--                    show-checkbox-->
+<!--                    ref="tree">-->
+<!--            </el-tree>-->
+<!--            <div id="roleFormButton" class="demo-drawer-footer">-->
+<!--                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
+<!--                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>-->
+<!--            </div>-->
+<!--        </el-drawer>-->
+<!--        <el-drawer-->
+<!--                title="选择责任部门对接人"-->
+<!--                :visible.sync="modalshowflag2"-->
+<!--                :wrapperClosable="false"-->
+<!--                size="800px">-->
+<!--            <el-tree-->
+<!--                    v-if="modalshowflag2"-->
+<!--                    node-key="id"-->
+<!--                    style="height: 100%; overflow: auto;"-->
+<!--                    class="filter-tree"-->
+<!--                    :data="treeData"-->
+<!--                    :props="defaultProps"-->
+<!--                    :default-checked-keys="nodeList2"-->
+<!--                    highlight-current-->
+<!--                    check-strictly-->
+<!--                    @check="drawerCheck2"-->
+<!--                    :expand-on-click-node="false"-->
+<!--                    show-checkbox-->
+<!--                    ref="tree2">-->
+<!--            </el-tree>-->
+<!--            <div id="roleFormButton2" class="demo-drawer-footer">-->
+<!--                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>-->
+<!--                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>-->
+<!--            </div>-->
+<!--        </el-drawer>-->
     </div>
 </template>
 
@@ -392,6 +397,7 @@
                 saveLoading: false,
                 // 基础信息form表单
                 form: {
+                    id: '',
                     itemsNum: '',
                     itemsName: '',
                     standId: '',
@@ -570,7 +576,7 @@
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
-                        infoId: this.form.id,
+                        infoId: this.form.standId,
                         page: 1,
                         pageSize: 9999
                     }, {
@@ -621,46 +627,25 @@
             },
             /*** **********************************************/
             /** 流程节点负责人的选择 *****************************/
-            choiceZRR (type, title, id) {
-                this.nodeList = []
-                this.nodeList.push(id)
-                this.type = type
-                this.drawerTitle = title
-                this.modalshowflag = true
-            },
-            getTree () {
-                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-                    this.treeData = res.data
-                })
-            },
-            saveUserInfo () {
-                if (this.type === 'deptUserId') {
-                    this.roleForm.deptUserId = this.roleRow.id
-                    this.roleForm.deptUserIdName = this.roleRow.name
+            saveUserInfo (data) {
+                if (this.type === 0) {
+                    this.roleForm.deptUserId = data[0].id
+                    this.roleForm.deptUserIdName = data[0].name
+                } else if (this.type === 1) {
+                    this.itemList[this.zrIndex].zrUserId = data[0].id
+                    this.itemList[this.zrIndex].zrUserIdName = data[0].name
+                } else {
+                    this.itemList.forEach( item => {
+                        this.zrIdList.forEach( items => {
+                            if (item.id === items) {
+                                item.zrUserId = data[0].id
+                                item.zrUserIdName = data[0].name
+                            }
+                        })
+                    })
                 }
                 this.modalshowflag = false
             },
-            cancleUserInfo () {
-                this.modalshowflag = false
-            },
-            drawerCheck (data) {
-                var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-                if(getlist.length == 1) {
-                    this.roleRow = getlist[0]
-                }else {
-                    this.$refs.tree.setCheckedKeys([data.id]);
-                    this.roleRow = this.$refs.tree.getCheckedNodes()[0]
-                }
-            },
-            drawerCheck2 (data) {
-                var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
-                if(getlist.length == 1) {
-                    this.roleRow = getlist[0]
-                }else {
-                    this.$refs.tree2.setCheckedKeys([data.id]);
-                    this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
-                }
-            },
             handleSelectionChange (val) {
                 this.zrIdList = []
                 val.forEach( item => {
@@ -668,51 +653,30 @@
                 })
             },
             choiceZRRS (row, type, index) {
+                this.type = type
                 if (type === 1) {
-                    this.nodeList2 = []
-                    this.zrIndex= index
+                    this.drawerTitle = '选择责任人'
+                    this.nodeList = []
+                    this.zrIndex = index
                     this.zrType = type
-                    this.nodeList2.push(row)
-                    this.modalshowflag2 = true
-                } else {
+                    this.nodeList.push(row)
+                    this.modalshowflag = true
+                } else if (type === 2) {
                     // 批量
                     if (this.zrIdList.length > 0) {
                         this.zrType = type
-                        this.nodeList2 = []
-                        this.modalshowflag2 = true
+                        this.nodeList = []
+                        this.modalshowflag = true
+                        this.drawerTitle = '批量选择责任人'
                     } else {
                      this.$message.warning('请选择要编辑的数据')
                     }
-                }
-            },
-            saveUserInfo2 () {
-                var idList = ''
-                var nameList = ''
-                this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
-                    if (nameList.length > 0) {
-                        nameList += ','
-                        idList += ','
-                    }
-                    idList += item.id
-                    nameList += item.name
-                })
-                if (this.zrType == 1) {
-                    this.itemList[this.zrIndex].zrUserId = idList
-                    this.itemList[this.zrIndex].zrUserIdName = nameList
                 } else {
-                    this.itemList.forEach( item => {
-                        this.zrIdList.forEach( items => {
-                            if (item.id === items) {
-                                item.zrUserId = idList
-                                item.zrUserIdName = nameList
-                            }
-                        })
-                    })
+                    this.nodeList = []
+                    this.nodeList.push(row)
+                    this.drawerTitle = '选择标准法规部部长'
+                    this.modalshowflag = true
                 }
-                this.modalshowflag2 = false
-            },
-            cancleUserInfo2 () {
-                this.modalshowflag2 = false
             },
             handleTabs(name) {
                 this.active = name
@@ -766,7 +730,6 @@
             }
         },
         mounted () {
-            this.getTree()
             this.sarStandCompareHis()
             this.sarStandCompareHis2()
             this.tableHeight = $('.content').height() - 44

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

@@ -49,26 +49,25 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="listForm.fileName">
-                  <p>{{listForm.fileName}}
+                <div>
+                  <p>
+                    {{ listForm.fileName }}
+                    <el-upload
+                      :action="uploadFileListPath"
+                      show-file-list
+                      :file-list="fileInfoList"
+                      name="file"
+                      accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                      :on-remove="delFileInfo"
+                      :on-success="uploadBackSuccess"
+                      :before-upload="beforeUpload"
+                    >
+                      <el-button class="common-button-default" size="mini">
+                        点击上传
+                      </el-button>
+                    </el-upload>
                   </p>
                 </div>
-                <div v-else>
-                  <el-upload
-                    :action="uploadFileListPath"
-                    show-file-list
-                    :file-list="fileInfoList"
-                    name="file"
-                    accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                    :on-remove="delFileInfo"
-                    :on-success="uploadBackSuccess"
-                    :before-upload="beforeUpload"
-                  >
-                    <el-button class="common-button-default" size="mini">
-                      点击上传
-                    </el-button>
-                  </el-upload>
-                </div>
               </el-form-item>
               <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="signFlag" @change="selectSign">
@@ -741,17 +740,13 @@ export default {
       },
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.id,
+        startUser: this.$store.getters.userInfo.userId,
         dockUser: "",
-        responUserList: "",
         ministerUser: "",
         directorUser: "",
-        presidentUser: "",
         dockUserName: "",
-        responUserListName: "",
         ministerUserName: "",
         directorUserName: "",
-        presidentUserName: ""
       },
       formRules: {
         listType: [
@@ -806,7 +801,7 @@ export default {
         modelName: "",
         standId: "", //选择的清单的id
         signFlag: "1",  //是否会签  1为会签 2为不会签
-        inforlist: "", //用来存放标准列表的标准id
+        inforlist: " ", //用来存放标准列表的标准id
         dataList: [{
           code: "", //标准号
           standName: "", //标准名称
@@ -850,9 +845,6 @@ export default {
       } else if (this.type === "directorUser") {
         this.roleForm.directorUser = data[0].id;
         this.roleForm.directorUserName = data[0].name;
-      } else if (this.type === "presidentUser") {
-        this.roleForm.presidentUser = data[0].id;
-        this.roleForm.presidentUserName = data[0].name;
       }
       this.modalshowflag = false;
     },
@@ -1032,19 +1024,8 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
-        let json = this.listForm;
-        this.listForm.fileId = this.fileIds.join(",");
-        this.listForm.fileName = this.fileListName.join(",");
-        this.listForm.model = this.listForm.fileId;
-        this.listForm.modelName = this.listForm.fileName;
-        json.zrUserId = this.roleForm.dockUser; //会签人
-        json.jlUserId = this.roleForm.directorUser;   //业务经理
-        json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
-        json.approvalOpinion = "";
-        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.uName;
-        json.standName = this.listForm.listName;
-        json.standId = this.listForm.standId;
+        var json = Object.assign(this.listForm, this.roleForm)
+        console.log(json);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
@@ -1085,8 +1066,10 @@ export default {
         middle.push(item.name);
         files.push(item.response.data.id);
       });
-      this.fileListName = middle;
-      this.fileIds = files;
+      this.listForm.fileName = middle.join(',');
+      this.listForm.fileId = files.join(',');
+      // this.fileListName = middle;
+      // this.fileIds = files;
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1100,6 +1083,17 @@ export default {
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
+        if(this.listForm.fileName === null || this.listForm.fileName === undefined){
+          this.listForm.fileName = this.fileListName.join(',')
+        } else {
+          this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
+        }
+        if(this.listForm.fileId === null || this.listForm.fileId === undefined){
+          this.listForm.fileId = this.fileIds.join(',')
+        }else {
+          this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
+        }
+        console.log(this.listForm);
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1202,6 +1196,7 @@ export default {
       if (this.standList.length < 1) {
         this.$message.warning("请选择需要添加进清单的数据");
       } else {
+        let exits = []
         this.standList.map(item => {
           let newStand = false;
           for (let itemKey of this.dataList) {
@@ -1214,8 +1209,14 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
+            exits.push(item.id)
           }
         });
+        if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){
+          this.listForm.inforlist = exits.join(',')
+        } else {
+          this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
+        }
         this.standardData = [];
         this.standModel = false;
       }

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

@@ -369,14 +369,11 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
-      this.listForm.zrUserId = this.listForm.zrUserId;
-      this.listForm.jlUserId = this.listForm.jlUserId;
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写会签意见')
+      }
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {

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

@@ -527,14 +527,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
-      this.listForm.zrUserId = this.listForm.zrUserId;
-      this.listForm.jlUserId = this.listForm.jlUserId;
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.commentText = this.commentText;
-      this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,

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

@@ -376,14 +376,10 @@
             },
             //提交事件
             handleSubmit() {
-                this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
-                this.listForm.zrUserId = this.listForm.zrUserId;
-                this.listForm.jlUserId = this.listForm.jlUserId;
-                this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-                this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+            if (this.commentText === null || this.commentText === undefined || this.commentText === ''){
+              this.$message.warning('请填写审批意见')
+            }
                 this.listForm.commentText = this.commentText;
-                this.listForm.signflag = "";
-                this.listForm.standId = this.listForm.standId;
                 const json = JSON.stringify(this.listForm);
                 this.$http.post('lawss/activiti/completeTask', {
                     taskIds: this.taskIds,

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

@@ -511,9 +511,11 @@
                                             width = "800"
                                             :key="key1"
                                             :lazy=true
-                                            :multiple=false
+                                            :multiple=true
+                                            :check-Strictly="false"
                                             :modalShowFlag="modalShowFlag2"
                                             :drawerTitle="drawerTitle"
+                                            :show-checkBox="showCheckBox"
                                             :url="url"
                                             :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
@@ -525,9 +527,11 @@
                                             width = "800"
                                             :key="key2"
                                             :lazy=true
-                                            :multiple=false
+                                            :multiple=true
+                                            :check-Strictly="false"
                                             :modalShowFlag="modalShowFlag3"
                                             :drawerTitle="drawerTitle"
+                                            :show-checkBox="showCheckBox"
                                             :url="url"
                                             :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
@@ -539,20 +543,20 @@
                                             width = "800"
                                             :key="key3"
                                             :lazy=true
-                                            :multiple=false
+                                            :multiple=true
+                                            :check-Strictly="false"
                                             :modalShowFlag="modalShowFlag4"
                                             :drawerTitle="drawerTitle"
                                             :url="url"
+                                            :show-checkBox="showCheckBox"
                                             :urlChild="urlChild"
                                             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
                                             :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.gkdw"
-                                            placeholder="请输入归口管理部门"
-                                            clearable
-                                    ></el-input>
+                                  <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                                    <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                                  </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
@@ -727,6 +731,13 @@
                                             placeholder="请输入采标编号"
                                             clearable
                                     ></el-input>
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      style="position:absolute;top: 10px;right: 0;"
+                                      @click="selectLaws('cbbh'),config.attrName = '采标编号'"
+                                  >{{'手动查找'}}</el-button>
                                 </el-form-item>
 <!--                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
 <!--                                    <el-input-->
@@ -950,7 +961,13 @@
                 :visible.sync="modalShowFlag"
                 :wrapperClosable="false"
                 size="800px">
+          <el-input
+              style="width:70%;padding: 10px"
+              placeholder="请输入姓名"
+              v-model="filterText">
+          </el-input>
             <el-tree
+                    :filter-node-method="filterNode"
                     v-if="modalShowFlag"
                     node-key="id"
                     style="height: 100%; overflow: auto;"
@@ -1145,6 +1162,7 @@
         },
         data () {
             return {
+              filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
                 loadSarStandard: false,
@@ -1235,6 +1253,7 @@
                 url:'',
                 urlChild:'',
                 drawerTitle: '', //drawer标题
+                showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
                 defaultCheckedKeys: [],
                 nodeKeyCode: 'code',
@@ -1377,6 +1396,7 @@
                 modelOptions: [], // 模块体系架构
                 modelChildOptions: [], // 模块体系架构子集合
                 applyArcticOptions: [], // 适用车型
+                gkglbmOptions: [], // 归口管理部门
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
@@ -1391,6 +1411,9 @@
             }
         },
         watch:{
+          filterText(val) {
+            this.$refs.tree.filter(val);
+          },
             'form.standInData': {
                 handler: function() {
                     this.verifySarStandard = false
@@ -1444,6 +1467,11 @@
             },
         },
         methods: {
+          // z责任人会签姓名搜索
+          filterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
+          },
           getTaskId () {
             queryTaskFirst({
               bpnId: this.$route.query.bpnId
@@ -1655,6 +1683,7 @@
                 }
             },
             saveUserInfo () {
+              this.filterText = ''
                 if (this.userType === 'zrUserId') {
                     this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
                     this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
@@ -1666,6 +1695,7 @@
                 this.modalShowFlag = false
             },
             cancelUserInfo () {
+                this.filterText = ''
                 this.modalShowFlag = false
             },
             drawerCheck (data) {
@@ -1834,12 +1864,15 @@
                     this.replaceLawsNumModel = false
                 })
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
+              // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'dtbjh'){
-                    this.form.dtbjh = textArr.join(',')
+                    this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'yybj'){
-                    this.form.yybj = textArr.join(',')
+                    this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
+                }else if(this.replaceLawType === 'cbbh'){
+                    this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
-                    this.form.byybj = textArr.join(',')
+                    this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
@@ -2065,8 +2098,6 @@
                 saveTaskFirst(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
-                    // 流程保存之后，应该流转至草稿页面
-                    this.$router.push({path:'/processCenter?tabsName=TaskDraft'})
                     // this.bpnId = res.result
                 }).catch(e => {
                     this.saveLoading = false
@@ -2158,7 +2189,8 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.qcdwOption = res.data.QCDW // 体系类别
-              this.setMap(this.standStateOptions)
+                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+                this.setMap(this.standStateOptions)
             })
             this.busVsFunc()
             this.modelFunc()

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

@@ -201,84 +201,84 @@
                         <template slot="title">文本信息</template>
                     </ProcessTitle>
                     <div class="prc-content-border">
-                        <el-row :gutter="24">
-                            <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.xgdName">
-                                        {{ form.xgdName }}
-                                    </div>
-                                    <div v-else>
-                                        - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.fbgbjbdName">
-                                        {{ form.fbgbjbdName }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zbjbdName">
-                                        {{ form.zbjbdName }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.bpgName">
-                                        {{ form.bpgName }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ssgName">
-                                        {{ form.ssgName }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.kwjName">
-                                        {{ form.kwjName }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zqyjgName">
-                                        {{ form.zqyjgName }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.caName">
-                                        {{ form.caName }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.jdwjName">
-                                        {{ form.jdwjName }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
+                      <el-row :gutter="24">
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                            <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
+                              {{ form.xgdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                            <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
+                              {{ form.fbgbjbdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
+                              {{ form.zbjbdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                              {{ form.bpgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+                              {{ form.ssgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                            <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
+                              {{ form.kwjName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
+                              {{ form.zqyjgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
+                              {{ form.caName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                            <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
+                              {{ form.jdwjName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
                     </div>
                     <ProcessTitle>
                         <template slot="title">适用范围</template>
@@ -328,14 +328,11 @@
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.dybxh" disabled></el-input>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.gkdw"
-                                            placeholder="请输入归口管理部门"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
+                              <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                                  <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
                                         <el-option
@@ -467,14 +464,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.glwjName">
-                                        {{ form.glwjName }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
+                              <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
+                                <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
+                                  {{ form.glwjName }}
+                                </div>
+                                <div v-else>
+                                  - -
+                                </div>
+                              </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -685,6 +682,16 @@
         name: "bzrkStep2",
         data () {
             return {
+              xgdFileId: '',
+              fbgbjbdFileId: '',
+              bpgFileId: '',
+              ssgFileId: '',
+              zqyjgFileId: '',
+              jdwjFileId: '',
+              kwjFileId: '',
+              glwjFileId: '',
+              caFileId: '',
+              zbjbdFileId:'',
               rules: {
                 commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                 approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
@@ -811,6 +818,7 @@
                 standStateOptions: [], // 文本状态
                 standSystemOptions: [], // 标准体系
                 applyArcticOptions: [], // 适用车型
+                gkglbmOptions: [], // 归口管理部门
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
@@ -844,6 +852,29 @@
         },
       },
         methods: {
+          downloadFile (fileType) {
+            if(fileType === 'fbgbjbd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+            }else if(fileType === 'xgd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+            }else if(fileType === 'bpg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+            }else if(fileType === 'ssg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+            }else if(fileType === 'zqyjg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+            }else if(fileType === 'jdwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+            }else if(fileType === 'kwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+            }else if(fileType === 'glwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+            }else if(fileType === 'ca'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+            }else if(fileType === 'zbjbd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+            }
+          },
           getRule(){
             if (this.formTongGuo.approvalOpinion !== '1') {
               this.$refs.formTongGuo.clearValidate('commentText')
@@ -910,6 +941,16 @@
                     }).then(res => {
                         if (res) {
                           const processForm = JSON.parse(res.mesg)
+                          this.xgdFileId = processForm.xgd
+                          this.fbgbjbdFileId = processForm.fbgbjbd
+                          this.bpgFileId = processForm.bpg
+                          this.ssgFileId = processForm.ssg
+                          this.zqyjgFileId = processForm.zqyjg
+                          this.jdwjFileId = processForm.jdwj
+                          this.kwjFileId = processForm.kwj
+                          this.glwjFileId = processForm.glwj
+                          this.caFileId = processForm.ca
+                          this.zbjbdFileId = processForm.zbjbd
                           this.getFormFieldList(processForm)
                         }
                     }).catch(e => {
@@ -1027,6 +1068,7 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
                 this.key++
             })
             this.busVsFunc()

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

@@ -197,7 +197,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                  <div v-if="form.xgdName">
+                  <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
                     {{ form.xgdName }}
                   </div>
                   <div v-else>
@@ -205,7 +205,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
-                  <div v-if="form.fbgbjbdName">
+                  <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
                     {{ form.fbgbjbdName }}
                   </div>
                   <div v-else>
@@ -213,7 +213,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zbjbdName">
+                  <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
                     {{ form.zbjbdName }}
                   </div>
                   <div v-else>
@@ -221,7 +221,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.bpgName">
+                  <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
                     {{ form.bpgName }}
                   </div>
                   <div v-else>
@@ -229,7 +229,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.ssgName">
+                  <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
                     {{ form.ssgName }}
                   </div>
                   <div v-else>
@@ -239,7 +239,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.kwjName">
+                  <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
                     {{ form.kwjName }}
                   </div>
                   <div v-else>
@@ -247,7 +247,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zqyjgName">
+                  <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
                     {{ form.zqyjgName }}
                   </div>
                   <div v-else>
@@ -255,7 +255,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                  <div v-if="form.caName">
+                  <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
                     {{ form.caName }}
                   </div>
                   <div v-else>
@@ -263,7 +263,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.jdwjName">
+                  <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
                     {{ form.jdwjName }}
                   </div>
                   <div v-else>
@@ -322,12 +322,9 @@
                   <el-input v-model="form.dybxh" disabled></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.gkdw"
-                      placeholder="请输入归口管理部门"
-                      clearable
-                  ></el-input>
+                  <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                    <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                  </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                     <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
@@ -461,7 +458,7 @@
 <!--                  ></el-input>-->
 <!--                </el-form-item>-->
                 <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.glwjName">
+                  <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
                     {{ form.glwjName }}
                   </div>
                   <div v-else>
@@ -666,6 +663,16 @@ export default {
   name: "bzrkStep3",
   data () {
     return {
+      xgdFileId: '',
+      fbgbjbdFileId: '',
+      bpgFileId: '',
+      ssgFileId: '',
+      zqyjgFileId: '',
+      jdwjFileId: '',
+      kwjFileId: '',
+      glwjFileId: '',
+      caFileId: '',
+      zbjbdFileId:'',
       activeName:'1',
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -785,6 +792,7 @@ export default {
       standStateOptions: [], // 文本状态
       standSystemOptions: [], // 标准体系
       applyArcticOptions: [], // 适用车型
+      gkglbmOptions: [], // 归口管理部门
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
@@ -818,6 +826,29 @@ export default {
     },
   },
   methods: {
+    downloadFile (fileType) {
+      if(fileType === 'fbgbjbd'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+      }else if(fileType === 'xgd'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+      }else if(fileType === 'bpg'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+      }else if(fileType === 'ssg'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+      }else if(fileType === 'zqyjg'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+      }else if(fileType === 'jdwj'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+      }else if(fileType === 'kwj'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+      }else if(fileType === 'glwj'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+      }else if(fileType === 'ca'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+      }else if(fileType === 'zbjbd'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+      }
+    },
     popoverHide (checkedIds, checkedData) {
       if(checkedData) {
         this.form.standSystem = checkedData.id
@@ -879,6 +910,16 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
+            this.xgdFileId = processForm.xgd
+            this.fbgbjbdFileId = processForm.fbgbjbd
+            this.bpgFileId = processForm.bpg
+            this.ssgFileId = processForm.ssg
+            this.zqyjgFileId = processForm.zqyjg
+            this.jdwjFileId = processForm.jdwj
+            this.kwjFileId = processForm.kwj
+            this.glwjFileId = processForm.glwj
+            this.caFileId = processForm.ca
+            this.zbjbdFileId = processForm.zbjbd
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
@@ -1011,6 +1052,7 @@ export default {
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
+      this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
       this.key++
     })
     this.busVsFunc()

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

@@ -534,11 +534,9 @@
                           :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                  <el-input
-                      v-model="form.gkdw"
-                      placeholder="请输入归口管理部门"
-                      clearable
-                  ></el-input>
+                  <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                    <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                  </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                     <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
@@ -709,7 +707,7 @@
                           class="common-button-primary"
                           size="mini"
                           style="position:absolute;top: 10px;right: 0;"
-                          @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
+                          @click="selectLaws('yybj'),config.attrName = '引用标准'"
                   >{{'手动查找'}}</el-button>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
@@ -718,6 +716,13 @@
                       placeholder="请输入采标编号"
                       clearable
                   ></el-input>
+                  <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      style="position:absolute;top: 10px;right: 0;"
+                      @click="selectLaws('cbbh'),config.attrName = '采标编号'"
+                  >{{'手动查找'}}</el-button>
                 </el-form-item>
                 <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
                   <el-input
@@ -730,7 +735,7 @@
                           class="common-button-primary"
                           size="mini"
                           style="position:absolute;top: 10px;right: 0;"
-                          @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
+                          @click="selectLaws('byybj'),config.attrName = '被引用标准'"
                   >{{'手动查找'}}</el-button>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
@@ -1218,6 +1223,7 @@ export default {
       modelOptions: [], // 模块体系架构
       applyArcticOptions: [], // 适用车型
       categoryOptions: [], // 能源类型
+      gkglbmOptions: [], // 归口管理部门
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
       wssmrOptions: [], // 我司署名人
@@ -1398,12 +1404,15 @@ export default {
         this.replaceLawsNumModel = false
       })
       // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
+      // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
       if(this.replaceLawType === 'dtbjh'){
-        this.form.dtbjh = textArr.join(',')
+        this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
       }else if(this.replaceLawType === 'yybj'){
-        this.form.yybj = textArr.join(',')
-      }else {
-        this.form.byybj = textArr.join(',')
+        this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
+      }else if(this.replaceLawType === 'cbbh'){
+        this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+      } else {
+        this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
       }
       // this.$emit('input', textArr.join(','))
       this.$refs.selections.clearSelection()
@@ -1605,6 +1614,7 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
+            this.commentText = processForm.commentText
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
@@ -1739,6 +1749,7 @@ export default {
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
+      this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
       this.treeStatus = true
       this.key++
     })

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

@@ -42,13 +42,11 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.standYear"
-                                            type="year"
-                                            placeholder="请选择标准年份"
-                                            value-format="yyyy">
-                                    </el-date-picker>
+                                  <el-input
+                                      v-model.number="form.standYear"
+                                      placeholder="请输入标准标准年份"
+                                      disabled
+                                  ></el-input>
                                 </el-form-item>
                                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                                     <el-input
@@ -119,10 +117,16 @@
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                                    <tree-select
-                                            :data="standSystemOptions"
-                                            :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
+                                  <el-input
+                                      disabled
+                                      v-model="form.standSystem"
+                                      placeholder="请选择标准体系"
+                                      clearable
+                                  ></el-input>
+<!--                                    <tree-select-->
+<!--                                            :data="standSystemOptions"-->
+<!--                                            :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"-->
+<!--                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>-->
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
@@ -198,84 +202,84 @@
                         <template slot="title">文本信息</template>
                     </ProcessTitle>
                     <div class="prc-content-border">
-                        <el-row :gutter="24">
-                            <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
-                                    <div v-if="form.xgd">
-                                        {{ form.xgd }}
-                                    </div>
-                                    <div v-else>
-                                        - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
-                                    <div v-if="form.fbgbjbd">
-                                        {{ form.fbgbjbd }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zbjbd">
-                                        {{ form.zbjbd }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
-                                    <div v-if="form.bpg">
-                                        {{ form.bpg }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ssg">
-                                        {{ form.ssg }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
-                                    <div v-if="form.kwj">
-                                        {{ form.kwj }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zqyjg">
-                                        {{ form.zqyjg }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ca">
-                                        {{ form.ca }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
-                                    <div v-if="form.jdwj">
-                                        {{ form.jdwj }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
+                      <el-row :gutter="24">
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                            <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
+                              {{ form.xgdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                            <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
+                              {{ form.fbgbjbdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
+                              {{ form.zbjbdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                              {{ form.bpgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+                              {{ form.ssgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                            <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
+                              {{ form.kwjName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
+                              {{ form.zqyjgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
+                              {{ form.caName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                            <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
+                              {{ form.jdwjName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
                     </div>
                     <ProcessTitle>
                         <template slot="title">适用范围</template>
@@ -317,39 +321,45 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple disabled>
-                                        <el-option label="乘用车VPPS编码1" value="1"></el-option>
-                                        <el-option label="乘用车VPPS编码2" value="2"></el-option>
-                                    </el-select>
+                                    <el-input
+                                        disabled
+                                        v-model.number="form.cycvppsbm"
+                                        placeholder="请选择关联模块--乘用车VPPS编码"
+                                        clearable
+                                    ></el-input>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple disabled>
-                                        <el-option label="卡车VPPS编码1" value="1"></el-option>
-                                        <el-option label="卡车VPPS编码2" value="2"></el-option>
-                                    </el-select>
+                                  <el-input
+                                      disabled
+                                      v-model.number="form.kccvppsbm"
+                                      placeholder="关联模块--卡车VPPS编码"
+                                      clearable
+                                  ></el-input>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple disabled>
-                                        <el-option label="模块结构单元变型号1" value="1"></el-option>
-                                        <el-option label="模块结构单元变型号2" value="2"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.gkdw"
-                                            placeholder="请输入归口管理部门"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="fbjg" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.fbjg"
-                                            placeholder="请选择起草单位"
-                                            clearable
-                                    ></el-input>
+                                  <el-input
+                                      disabled
+                                      v-model.number="form.dybxh"
+                                      placeholder="请选择模块结构单元变型号"
+                                      clearable
+                                  ></el-input>
                                 </el-form-item>
+                              <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
+                                <el-select disabled :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                                  <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                                </el-select>
+                              </el-form-item>
+                              <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                                  <el-option
+                                      v-for="item in qcdwOption"
+                                      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>
                                         <el-option
@@ -457,22 +467,23 @@
                                         <el-option label="采标程度2" value="2"></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.xglc"
-                                            placeholder="请输入相关流程"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
-                                    <div v-if="form.glwj">
-                                        {{ form.glwj }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
+<!--                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
+<!--                                    <el-input-->
+<!--                                            disabled-->
+<!--                                            v-model="form.xglc"-->
+<!--                                            placeholder="请输入相关流程"-->
+<!--                                            clearable-->
+<!--                                    ></el-input>-->
+<!--                                </el-form-item>-->
+                              <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
+                                <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
+                                  {{ form.glwjName }}
+                                </div>
+                                <div v-else>
+                                  - -
+                                </div>
+                              </el-form-item>
+
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -491,22 +502,22 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.byybj"
-                                            placeholder="请输入被引用标准"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.chjl"
-                                            placeholder="请输入参会记录"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
+<!--                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-input-->
+<!--                                            disabled-->
+<!--                                            v-model="form.byybj"-->
+<!--                                            placeholder="请输入被引用标准"-->
+<!--                                            clearable-->
+<!--                                    ></el-input>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
+<!--                                    <el-input-->
+<!--                                            disabled-->
+<!--                                            v-model="form.chjl"-->
+<!--                                            placeholder="请输入参会记录"-->
+<!--                                            clearable-->
+<!--                                    ></el-input>-->
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>
@@ -670,6 +681,16 @@
         name: "bzrkStep5",
         data () {
             return {
+              xgdFileId: '',
+              fbgbjbdFileId: '',
+              bpgFileId: '',
+              ssgFileId: '',
+              zqyjgFileId: '',
+              jdwjFileId: '',
+              kwjFileId: '',
+              glwjFileId: '',
+              caFileId: '',
+              zbjbdFileId:'',
               // 当前流程类型(1待办/2已办)
               processType: 1,
                 detailData: [],
@@ -760,12 +781,14 @@
                 standSystemOptions: [], // 标准体系
                 applyArcticOptions: [], // 适用车型
                 categoryOptions: [], // 能源类型
+                 gkglbmOptions: [], // 归口管理部门
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
                 zrgcsOptions: [], // 责任工程师
                 txlbOptions: [], // 体系类别
+              qcdwOption: [], // 起草单位
                 data: [], // 标准列表数据
                 ListForm: {}, // 新增数据
                 user1: '',
@@ -790,6 +813,29 @@
         },
       },
         methods: {
+          downloadFile (fileType) {
+            if(fileType === 'fbgbjbd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+            }else if(fileType === 'xgd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+            }else if(fileType === 'bpg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+            }else if(fileType === 'ssg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+            }else if(fileType === 'zqyjg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+            }else if(fileType === 'jdwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+            }else if(fileType === 'kwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+            }else if(fileType === 'glwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+            }else if(fileType === 'ca'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+            }else if(fileType === 'zbjbd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+            }
+          },
             popoverHide (checkedIds, checkedData) {
                 console.log(checkedIds);
                 console.log(checkedData);
@@ -816,6 +862,21 @@
                     }).then(res => {
                         if (res) {
                           const processForm = JSON.parse(res.mesg)
+                          this.xgdFileId = processForm.xgd
+                          this.fbgbjbdFileId = processForm.fbgbjbd
+                          this.bpgFileId = processForm.bpg
+                          this.ssgFileId = processForm.ssg
+                          this.zqyjgFileId = processForm.zqyjg
+                          this.jdwjFileId = processForm.jdwj
+                          this.kwjFileId = processForm.kwj
+                          this.glwjFileId = processForm.glwj
+                          this.caFileId = processForm.ca
+                          this.zbjbdFileId = processForm.zbjbd
+                          this.form.standYear = processForm.standYear
+                          this.form.standSystem = processForm.standSystem
+                          this.form.kccvppsbm = processForm.kccvppsbm
+                          this.form.cycvppsbm = processForm.cycvppsbm
+                          this.form.dybxh = processForm.dybxh
                           this.getFormFieldList(processForm)
                         }
                     }).catch(e => {
@@ -914,6 +975,8 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                this.qcdwOption = res.data.QCDW // 体系类别
+                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
             })
         }
     }

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

@@ -0,0 +1,622 @@
+<template>
+    <div class="bzzqyjStep1-1">
+        <!--    标准征求意见流程-->
+        <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="bzzqyjForm"
+                        :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="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>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.cid"
+                                            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.cname"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            placeholder="请选择结束日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </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 class="content" v-show="active === '2'">
+            <div class="block" style="padding-top: 20px;">
+                <el-timeline>
+                    <el-form
+                            ref="Form"
+                            :model="roleForm"
+                            :rules="roleFormRules"
+                            class="label-input-form myForm">
+                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="startUserName" style="margin-bottom: 0">
+                                    <h4>流程发起人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.startUser" style="display: none;"/>
+                                        <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled/>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="dockUserList" style="margin-bottom: 0">
+                                    <h4>责任部门对接人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.dockUserList" style="display: none;"/>
+                                        <el-input
+                                                v-model="roleForm.dockUserListName"
+                                                placeholder="选择责任部门对接人"
+                                                @click.native="choiceZRRS">
+                                        </el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="审核征求意见" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="ministerUser" style="margin-bottom: 0">
+                                    <h4>标准法规部部长</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.ministerUser" style="display: none;"/>
+                                        <el-input
+                                                v-model="roleForm.ministerUserName"
+                                                placeholder="选择标准法规部部长·"
+                                                @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
+                                        />
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="directorUser" style="margin-bottom: 0">
+                                    <h4>技术管理中心主任</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.directorUser" style="display: none;"/>
+                                        <el-input
+                                                v-model="roleForm.directorUserName"
+                                                placeholder="选择技术管理中心主任"
+                                                @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
+                                        />
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="presidentUser" style="margin-bottom: 0">
+                                    <h4>工程研究总院院长</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.presidentUser" style="display: none;"/>
+                                        <el-input
+                                                v-model="roleForm.presidentUserName"
+                                                placeholder="选择工程研究总院院长"
+                                                @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"
+                                        />
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                    </el-form>
+                </el-timeline>
+            </div>
+        </div>
+        <ProcessFooter
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                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">
+                                    <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>
+                            </div>
+                        </div>
+                    </table-tools-bar>
+                    <div class="table-wrap">
+                        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+                            <el-table
+                                    ref="selection"
+                                    :data="standInfoList"
+                                    tooltip-effect="dark"
+                                    style="width: 100%;padding:0 0 20px 0;"
+                                    height="100%"
+                                    border
+                                    @selection-change="handleSelection"
+                                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                                <el-table-column type="selection" width="55" align="center"/>
+                                <el-table-column label="标准号" align="center">
+                                    <template slot-scope="scope">
+                                        <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
+                                        <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="cname" label="标准名称" align="center">
+                                    <template slot-scope="scope">
+                                        <div>{{ scope.row.standName }}</div>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                    </div>
+                </div>
+                <pagination :page="standCommonlySearch.page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+                <loading :loading="spinShow">数据加载中……</loading>
+                <div class="demo-drawer-footer">
+                    <el-button size="mini" @click="closeDrawer">取消</el-button>
+                    <el-button type="primary" size="mini" @click="enterDrawer">带入</el-button>
+                </div>
+            </div>
+        </el-drawer>
+        <Role-tree
+                is-title="选择责任部门对接人"
+                :is-visible.sync="modalshowflag2"
+                @checkedRole="checkedRole2"
+                :nodeList="nodeList2"
+        ></Role-tree>
+        <Role-tree
+                check-box
+                :is-title="drawerTitle"
+                :is-visible.sync="modalshowflag"
+                @checkedRole="checkedRole"
+                :nodeList="nodeList"
+        ></Role-tree>
+    </div>
+</template>
+
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import { saveTaskFirst, queryTaskFirst } from 'api/process'
+
+    export default {
+        name: "bzzqyjStep1-1",
+        data() {
+            return {
+                commentText: '',
+                textarea: '', // 意见
+                title: '', // 新增抽屉标题
+                listModel: false, // 新增抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                // 基础信息form表单
+                form: {
+                    cid: '', // 编号
+                    endTime: '', // 结束日期
+                    cname: '', // 名称
+                },
+                formRules: {
+                    cid: [
+                        { required: true, message: '请输入标准编号', trigger: 'change' },
+                    ],
+                    endTime: [
+                        { required: true, message: '请输入标准结束日期', trigger: 'change' },
+                    ],
+                    cname: [
+                        { required: true, message: '请输入标准名称', trigger: 'change' },
+                    ],
+                },
+                // 标准征求意见数据可库
+                standCommonlySearch: {
+                    standSort: '',
+                    standNumber: '',
+                    standType: '',
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent
+                },
+                spinShow: false,
+                standInfoList: [],
+                tableHeight: null,
+                total: 0,
+                selectedList: [],
+                data: [],
+                roleForm: {
+                    startUserName: this.$store.getters.userInfo.userName,
+                    startUser: this.$store.getters.userInfo.userId,
+                    dockUserList: '',
+                    dockUserListName: '',
+                    ministerUser: '',
+                    ministerUserName: '',
+                    directorUser: '',
+                    directorUserName: '',
+                    presidentUser: '',
+                    presidentUserName: '',
+                },
+                roleFormRules: {
+                    dockUserList: [
+                        { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+                    ],
+                    ministerUser: [
+                        { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+                    ],
+                    directorUser: [
+                        { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
+                    ],
+                    presidentUser: [
+                        { required: true, message: '请选择工程研究院院长', trigger: 'change' },
+                    ]
+                },
+                nodeList: [],
+                nodeList2: [],
+                type: '',
+                drawerTitle: '',
+                modalshowflag: false,
+                modalshowflag2: false,
+                standSortOptions: [],
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        mounted () {
+            this.getData()
+            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
+            }
+        },
+        methods: {
+            getData () {
+                queryTaskFirst({
+                    bpnId: this.$route.query.bpnId
+                }).then(res => {
+                    let mes = JSON.parse(res.mes)
+                    mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
+                    this.form = mes.form
+                    this.roleForm = mes.roleForm
+                    this.commentText = mes.commentText
+                })
+            },
+            addZqyjList() {
+                this.title = '国内外标准库'
+                this.listModel = true
+            },
+            /** 标准征求意见库方法*
+             * **********************************************/
+            // 清空
+            clearSearchStand () {
+                this.standCommonlySearch.page = 1
+                this.standCommonlySearch.standSort = ''
+                this.standCommonlySearch.standNumber = ''
+                this.standCommonlySearch.standType = ''
+                this.sarStandCompareHis()
+            },
+            // 搜索
+            sarStandCompareHisInfo() {
+                this.standCommonlySearch.page = 1
+                this.sarStandCompareHis()
+            },
+            // 查询表格
+            sarStandCompareHis () {
+                this.spinShow = true
+                var formData = this.standCommonlySearch
+                this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
+                    _this: this
+                }, res => {
+                    this.standInfoList = res.data.list
+                    this.total = res.data.count
+                    this.spinShow = false
+                })
+                // var form = this.standCommonlySearch
+                // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
+                //   _this: this
+                // }, res => {
+                //   this.standInfoList = res.data.records
+                //   this.total = res.data.total
+                //   this.spinShow = false
+                // }, e => {
+                // })
+            },
+            pageChange (page) {
+                this.standCommonlySearch.page = page
+                this.sarStandCompareHis()
+            },
+            // 分页每页显示数改变后方法
+            pageSizeChange (pageSize) {
+                this.$store.getters.userInfo.configContent = pageSize
+                this.standCommonlySearch.size = pageSize
+                this.sarStandCompareHis()
+            },
+            /** 选择带入数据的方法操作
+             * */
+            handleSelection(data) {
+                this.selectedList = [];
+                for (let i = 0; i < data.length; i++) {
+                    this.selectedList.push(data[i].id);
+                }
+            },
+            closeDrawer() {
+                this.listModel = false
+            },
+            enterDrawer() {
+                if (this.selectedList.length === 1) {
+                    let deposit = new Map();
+                    this.standInfoList.forEach(item => {
+                        deposit.set(item.id, item);
+                    });
+                    let bringData = [];
+                    for (let i = 0; i < this.selectedList.length; i++) {
+                        bringData.push(deposit.get(this.selectedList[i]));
+                    }
+                    if (bringData[0].standYear) {
+                        this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
+                    } else {
+                        this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
+                    }
+                    this.form.cname = bringData[0].standName;
+                    this.listModel = false;
+                } else if (this.selectedList.length > 1) {
+                    this.$message.warning("只能选择一条数据进行带入");
+                } else {
+                    this.$message.warning("请选择一条数据进行带入");
+                }
+            },
+            /*** **********************************************/
+            /** 流程节点负责人的选择 *****************************/
+            checkedRole2 (data) {
+                var idList = ''
+                var nameList = ''
+                data.forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.roleForm.dockUserList = idList
+                this.roleForm.dockUserListName = nameList
+            },
+            checkedRole (data) {
+                if (this.type === 'ministerUser') {
+                    this.roleForm.ministerUser = data[0].id
+                    this.roleForm.ministerUserName = data[0].name
+                } else if (this.type === 'directorUser') {
+                    this.roleForm.directorUser = data[0].id
+                    this.roleForm.directorUserName = data[0].name
+                } else if (this.type === 'presidentUser') {
+                    this.roleForm.presidentUser = data[0].id
+                    this.roleForm.presidentUserName = data[0].name
+                }
+            },
+            choiceZRRS () {
+                this.nodeList2 = []
+                if ( this.roleForm.dockUserList.length > 0) {
+                    this.nodeList2 = this.roleForm.dockUserList.split(',')
+                }
+                this.modalshowflag2 = true
+            },
+            choiceZRR (type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.type = type
+                this.drawerTitle = title
+                this.modalshowflag = true
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.$refs['bzzqyjForm'].validate((valid) => {
+                    if (valid) {
+                        this.$refs['Form'].validate((valid) => {
+                            if (valid) {
+                                this.isSubmit = true
+                                this.$http.get('lawss/activiti/startProcess', {
+                                    type: '3'
+                                }, {}, res => {
+                                    if (res.ok) {
+                                        var json = Object.assign(this.form, this.roleForm)
+                                        json.commentText = this.commentText
+                                        this.$http.post('lawss/activiti/completeTask', {
+                                            json: JSON.stringify(json),
+                                            taskId: res.data,
+                                            userId: this.$store.getters.userInfo.userId
+                                        }, {}, res => {
+                                            if (res.success) {
+                                                this.$message.success('流程发起成功')
+                                                this.$router.push('/processCenter')
+                                            }
+                                        })
+                                    } else {
+                                        this.$message.warning('流程启动失败')
+                                    }
+                                    this.isSubmit = false
+                                })
+                            } else {
+                                return this.$message.warning('请完善人员信息')
+                            }
+                        })
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    @import '~@/assets/styles/mixins';
+    .bzzqyjStep1-1 {
+        .myForm {
+            /deep/.el-form-item__content {
+                line-height: 10px;
+            }
+        }
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        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% - 107px');
+            overflow: auto;
+        }
+        .standardForComments {
+            height: 100%;
+            background: #fff;
+            .el-divider--horizontal {
+                display: block;
+                height: 1px;
+                width: 100%;
+                margin: 0;
+            }
+            flex-direction: column;
+            .action-bar {
+                margin-bottom: 5px;
+                padding: 0;
+            }
+            .content {
+                flex: auto;
+                overflow: hidden;
+                display: flex;
+                flex-direction: column;
+                .table-wrap {
+                    flex: auto;
+                    overflow: hidden;
+                    position: relative;
+                }
+            }
+            & > .pagination {
+                position: static;
+                /deep/.pagination-slot {
+                    padding: 0;
+                }
+            }
+        }
+    }
+</style>

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

@@ -263,6 +263,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
+import { saveTaskFirst } from 'api/process'
 
 export default {
   name: "bzzqyjStep1",
@@ -489,7 +490,26 @@ export default {
     handleTabs(name) {
       this.active = name
     },
-    handleSave() {},
+    handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '3')
+      _formData.append('json', JSON.stringify({
+        form: this.form,
+        roleForm: this.roleForm,
+        commentText: this.commentText
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     handleSubmit() {
       this.$refs['bzzqyjForm'].validate((valid) => {
         if (valid) {

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

@@ -135,7 +135,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -264,6 +263,7 @@
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
                         this.json = data
+                        console.log(data);
                     }).catch(e => {
                     })
                 })

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

@@ -184,7 +184,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"

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

@@ -167,7 +167,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"

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

@@ -193,7 +193,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"

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

@@ -184,7 +184,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"

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

@@ -184,7 +184,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"

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

@@ -184,7 +184,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"

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

@@ -184,7 +184,6 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"

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

@@ -288,18 +288,7 @@ export default {
     ProcessFooter,
     ProcessTitle
   },
-  mounted () {
-    this.getJsonData()
-  },
   methods: {
-    getJsonData() {
-      const params = {
-        type: '8'
-      }
-      startProcess(params).then(res => {
-        this.taskID = res.data
-      })
-    },
     //点击新增事件
     addList() {
       standUnqualified(this.queryUnqualidiedData).then(res => {
@@ -383,15 +372,21 @@ export default {
         } else {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
-              const params = new FormData();
-              params.set('json', JSON.stringify(json))
-              params.set('userId', this.$store.getters.userInfo.userId)
-              params.set('taskIds', this.taskID)
-              completeTask(params).then(res => {
-                if(res.success === true) {
-                  this.$message.success('提交成功')
-                  this.$router.push("/processCenter");
-                }
+              const paramsInfo = {
+                type: '8'
+              }
+              startProcess(paramsInfo).then(res => {
+                this.taskID = res.data
+                const params = new FormData();
+                params.set('json', JSON.stringify(json))
+                params.set('userId', this.$store.getters.userInfo.userId)
+                params.set('taskIds', this.taskID)
+                completeTask(params).then(res => {
+                  if(res.success === true) {
+                    this.$message.success('提交成功')
+                    this.$router.push("/processCenter");
+                  }
+                })
               })
             }
           })
@@ -407,7 +402,7 @@ export default {
       this.modalshowflag = true
     },
     drawerCheck (data) {
-      this.roleForm.dockUserName = data[0].id
+      this.roleForm.dockUser = data[0].id
       this.roleForm.dockUserName = data[0].name
       this.modalshowflag = false
     },

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

@@ -193,7 +193,6 @@ export default {
   },
   created() {
     this.getData()
-    this.getTree()
   },
   methods: {
     getData() {
@@ -293,8 +292,8 @@ export default {
     drawerCheck (data) {
       this.roleForm = data[0]
       // 选择责任人时input框内值
-      this.newDataList.dutyPeople = this.roleRow.name
-      this.newDataList.dutyPeopleId = this.roleRow.id
+      this.newDataList.dutyPeople = this.roleForm.name
+      this.newDataList.dutyPeopleId = this.roleForm.id
       this.lastDataList = this.dataList
       this.modalshowflag = false
     },

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

@@ -94,7 +94,7 @@
           <el-table-column prop="dutyEngineer" label="负责人"/>
           <el-table-column label="佐证材料" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-button  type="text" @click="download" >{{scope.row.fileText}}</el-button>
+              <el-button  type="text" @click="download(scope.row)" >{{scope.row.fileText}}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -187,9 +187,7 @@ export default {
     },
     getFormFieldList (item) {
       this.$nextTick(() => {
-        console.log(item)
         this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
-        console.log(this.dataList)
       })
     },
 
@@ -266,14 +264,8 @@ export default {
       this.getData()
     },
     download(row) {
-      // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
-      var name = row.fileText;
-      var url = row.fileTextPath;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
-      a.click()
+      let attId = row.fileTextId
+      window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
     },
     // 分页事件
     pageChange (page) {

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

@@ -28,16 +28,16 @@
               </el-form-item>
               <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                 <el-input
+                  disabled
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
+                  disabled
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
@@ -93,13 +93,22 @@
           <el-table-column
             prop="distributePerson"
             label="分发责任人">
+<!--                        <template slot-scope="scope">-->
+<!--                          <el-input v-model="scope.row.distributePerson" v-show="false"></el-input>-->
+<!--                          <el-input-->
+<!--                            v-model="dataList.distributePerson"-->
+<!--                            placeholder="请选择分发责任人"-->
+<!--                            @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
+<!--                            readonly-->
+<!--                            v-if="dataList[scope.$index].distributePerson==null"-->
+<!--                          />-->
+<!--                        </template>-->
             <template slot-scope="scope,text" v-if="showColumn">
               <div>
                 <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
-                  {{listForm.dataList[scope.$index].distributePerson==null?"请选择分发负责人":listForm.dataList[scope.$index].distributePerson}}
+                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
                 </div>
               </div>
-
             </template>
           </el-table-column>
         </el-table>
@@ -113,7 +122,7 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程"  placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
                   <h4>标准法规工程师</h4>
@@ -241,17 +250,26 @@
               >
               </el-table-column>
               <el-table-column
-                prop="issueTime"
+                prop="putTime"
                 label="发布日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
               </el-table-column>
               <el-table-column
-                prop="xcxssrq"
+                prop="xcxssrqgj"
                 label="新车型实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="zccssrq"
+                prop="zccssrqgj"
                 label="在产车实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -370,20 +388,20 @@ export default {
       // 查询相关参数
       searching: false,
       standardSearch: {
-        standType:'',
-        standName:'',
+        standType: "",
+        standName: ""
       },
       standardTypeOptions: [
         {
-          value: 'INLAND',
-          label: '国内标准法规',
-          item:'INLAND',
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
         },
         {
-          value: 'FOREIGN',
-          label: '海外标准法规',
-          item:'FOREIGN',
-        },
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
       ],
       nodeList: [],
       defaultProps: {
@@ -394,14 +412,14 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.id,
         qualityEngineer: "",
-        certifiedEngineer:"",
+        certifiedEngineer: "",
         qualityEngineerName: "",
-        certifiedEngineerName:"",
+        certifiedEngineerName: "",
         distributePerson: "",
-        dockUser:'',
-        ministerUser:"",
-        dockUserName:'',
-        ministerUserName:"",
+        dockUser: "",
+        ministerUser: "",
+        dockUserName: "",
+        ministerUserName: ""
       },
       formRules: {
         standName: [
@@ -415,7 +433,7 @@ export default {
         ],
         certifiedEngineer: [
           { required: true, message: "请选择认证工程师", trigger: "change" }
-        ],
+        ]
       },
       roleFormRules: {
         dockUserName: [
@@ -423,7 +441,7 @@ export default {
         ],
         ministerUserName: [
           { required: true, message: "请选择标准法规部领导", trigger: "change" }
-        ],
+        ]
       },
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
@@ -459,29 +477,29 @@ export default {
         dataList: [{
           projectLine: "", //产品线
           uname: "",//产品线责任人
-          projectManager:"",// 产品线责任人id
+          projectManager: "",// 产品线责任人id
           distributePerson: "", //分发责任人
           distributePersonId: "", //分发责任人id
           id: "",
           sarStandProjectLibraries: [{
-            projectManager: '',
-            projectLevel: '',
-            projectNumber: '',
-            projectEndDate: '',
-            currentNode: '',
-            projectGroup: '',
-            productLine: '',
-            projectClassification: '',
-            projectStatus: '',
-            projectStartDate: '',
-            id: '',
-            projectName: '',
-            projectPlatfor: ''
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
           }]
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      showColumn:true
+      showColumn: true
     };
   },
   methods: {
@@ -491,25 +509,26 @@ export default {
         this.roleForm.dockUserName = data[0].name;
       } else if (this.type === "ministerUser") {
         this.roleForm.ministerUser = data[0].id;
-        this.roleForm.ministerUserName =  data[0].name;
+        this.roleForm.ministerUserName = data[0].name;
       } else if (this.type === "qualityEngineer") {
         this.roleForm.qualityEngineer = data[0].id;
-        this.roleForm.qualityEngineerName =  data[0].name;
+        this.roleForm.qualityEngineerName = data[0].name;
         this.listForm.qualityEngineer = data[0].id;
         this.listForm.qualityEngineerName = data[0].name;
       } else if (this.type === "certifiedEngineer") {
         this.roleForm.certifiedEngineer = data[0].id;
         this.roleForm.certifiedEngineerName = data[0].name;
-        this.listForm.certifiedEngineer =  data[0].id;
-        this.listForm.certifiedEngineerName =  data[0].name;
+        this.listForm.certifiedEngineer = data[0].id;
+        this.listForm.certifiedEngineerName = data[0].name;
       } else if (this.type === "distributePerson") {
-        this.listForm.distributePerson = data[0].name;
-        this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id
-        this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name
+        // this.dataList.distributePerson = data[0].id;
+        // this.dataList.distributePersonName = data[0].name;
+        this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
+        this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
         this.showColumn = false;
         this.$nextTick(() => {
-          this.showColumn = true
-        })
+          this.showColumn = true;
+        });
       }
       this.modalshowflag = false;
     },
@@ -521,7 +540,7 @@ export default {
       this.active = name;
     },
     typeChange(type) {
-      this.standardSearch.standType = type
+      this.standardSearch.standType = type;
     },
     choiceShow() {
       this.ListModel = true;
@@ -542,32 +561,32 @@ export default {
     //点击添加事件
     addList() {
       this.standModel = true;
-      this.$refs.projectTable.clearSelection()
+      this.$refs.projectTable.clearSelection();
     },
     // 点击批量删除事件
     deleteList() {
-       if(this.selectList.length < 1){
-         this.$message.warning('请选择一条数据进行删除')
-       }else {
-          this.$confirm('您确认删除这些数据？', '提示', {
-            confirmButtonText: "确认",
-            confirmButtonClass: "common-button-primary",
-            cancelButtonText: "取消",
-            type: "warning"
-          }). then(() => {
-            this.selectList.map(item => {
-              let index;
-            index =  this.dataList.findIndex(items => {
-                return items.productLine = item
-              })
-              if (index > -1) {
-                this.dataList.splice(index, 1);
-              }
+      if (this.selectList.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据？", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.selectList.map(item => {
+            let index;
+            index = this.dataList.findIndex(items => {
+              return items.productLine = item;
             });
-            this.selectList = [];
-          }).catch(() => {
-          })
-       }
+            if (index > -1) {
+              this.dataList.splice(index, 1);
+            }
+          });
+          this.selectList = [];
+        }).catch(() => {
+        });
+      }
     },
     //取消添加事件
     cancelStand() {
@@ -576,21 +595,21 @@ export default {
     //确认添加事件
     okStand() {
       let proData = [];
-      if(this.dataList.length >= 1){
-       this.dataList.forEach(item => {
-         if(proData.length === 0){
-           proData.push(item.productLine)
-         }else if(!proData.includes(item.productLine)){
-           proData.push(item.productLine)
-         }
-       })
-        this.standList.forEach(items => {
-          if(!proData.includes(items.productLine)){
-            this.dataList.push(items)
+      if (this.dataList.length >= 1) {
+        this.dataList.forEach(item => {
+          if (proData.length === 0) {
+            proData.push(item.productLine);
+          } else if (!proData.includes(item.productLine)) {
+            proData.push(item.productLine);
           }
-        })
+        });
+        this.standList.forEach(items => {
+          if (!proData.includes(items.productLine)) {
+            this.dataList.push(items);
+          }
+        });
         this.standModel = false;
-      }else{
+      } else {
         if (this.standList.length >= 1) {
           this.dataList = this.standList;
           this.roleForm.directorUser = this.dataList[0].uname;
@@ -607,7 +626,7 @@ export default {
       let _formData = new FormData();
       _formData.append("createUser", this.$store.getters.userInfo.userId);
       _formData.append("createUserName", this.$store.getters.userInfo.uName);
-      _formData.append("prcType", '5');
+      _formData.append("prcType", "5");
       _formData.append("json", JSON.stringify({
         prcForm: this.prcForm,
         sarAccessInfoList: this.sarAccessInfoList,
@@ -625,19 +644,17 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      if (this.dataList.length < 1) {
+        this.$message.warning("请添加产品线信息");
+      }
       this.dataList.forEach(item => {
-        if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){
-          this.$message.warning('请选择分发责任人')
+        if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
+          this.$message.warning("请选择分发责任人");
         } else {
-          var json = Object.assign(this.listForm, this.roleForm)
-          json.prcCreateUser = this.$store.getters.userInfo.userId;
-          json.prcCreateUserName = this.$store.getters.userInfo.uName;
-          json.standId = this.listForm.standId;
-          json.XCXSSRQ =  this.sarAccessListDatas[0].xcxssrqgj
-          json.ZCCSSRQ =  this.sarAccessListDatas[0].zccssrqgj
-          this.$refs['listForm'].validate((valid) => {
+          var json = Object.assign(this.listForm, this.roleForm);
+          this.$refs["listForm"].validate((valid) => {
             if (valid) {
-              this.$refs['roleForm'].validate((valid) => {
+              this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
                     _this: this
@@ -666,7 +683,7 @@ export default {
             }
           });
         }
-      })
+      });
 
     },
     //选择拆分标准取消事件
@@ -723,8 +740,8 @@ export default {
     selectThree(data) {
       this.standList = data;
     },
-    choiceZRR(scope,type, title, id) {
-      if(scope!=null){
+    choiceZRR(scope, type, title, id) {
+      if (scope != null) {
         this.dsadadadsada = scope.$index;
       }
       this.nodeList = [];
@@ -740,19 +757,19 @@ export default {
     },
     pageChange(page) {
       this.page = page;
-      this.getStandData()
+      this.getStandData();
     },
     pageSizeChange(pageSize) {
       this.pageSize = this.$store.getters.userInfo.configContent;
-      this.getStandData()
+      this.getStandData();
     },
     pageChangeNo(page) {
       this.pageNO = page;
-      this.getProductData()
+      this.getProductData();
     },
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
-      this.getProductData()
+      this.getProductData();
     },
     //获取产品线数据
     getProductData() {
@@ -769,27 +786,27 @@ export default {
       });
     },
     //获取标准数据
-    getStandData(){
-      this.$http.post('SarStandItems/sar-stand-items/findStand',{
+    getStandData() {
+      this.$http.post("SarStandItems/sar-stand-items/findStand", {
         page: this.page,
         size: this.pageSize,
-        ...this.standardSearch,
-      },{
-        _this: this,
+        ...this.standardSearch
+      }, {
+        _this: this
       }, res => {
         this.sarAccessListDatas = res.records;
-        this.total = res.total
+        this.total = res.total;
       }, e => {
 
-      })
+      });
     },
     clearSearch() {
       this.standardSearch = {
         standName: "",
-        standType:"",
+        standType: ""
       };
       this.getStandData();
-    },
+    }
   },
   computed: {},
   mounted() {

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

@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">

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

@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">

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

@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">

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

@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">

src/pages/processCenter/pages/creatProcess/xmpg/step6.vue

@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">

src/pages/processCenter/pages/creatProcess/xmpg/step7.vue

@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -297,7 +296,7 @@ export default {
       saveLoading: false,
       //表单的数据
       listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
+        bzFlag: " ", //1审批通过 其他为驳回
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.bzFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
-    }
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.bzFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -297,7 +296,7 @@ export default {
       saveLoading: false,
       //表单的数据
       listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
+        bzFlag: " ", //1审批通过 其他为驳回
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
@@ -359,43 +358,52 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
+      if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
+        this.$message.warning('请填写审批意见')
+      } else {
+        this.listForm.bzFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
-    }
+      if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
+        this.$message.warning('请填写审批意见')
+      } else {
+        this.listForm.bzFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
   },
+
   computed: {
     listNoDataText() {
       return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -297,7 +296,7 @@ export default {
       saveLoading: false,
       //表单的数据
       listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
+        dlFlag: " ", //1审批通过 其他为驳回
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.dlFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
-    }
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.dlFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
   },
   computed: {
     listNoDataText() {
@@ -404,7 +411,7 @@ export default {
   mounted() {
     this.processTable();
     this.getData();
-  }
+  },
 };
 </script>
 

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

@@ -83,7 +83,8 @@
           </el-table-column>
           <el-table-column label="责任人" prop="workPeople" align="center">
             <template slot-scope="scope">
-              <div :class="{'fileClass': !scope.row.workPeople}">{{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div>
+              <div :class="{'fileClass': !scope.row.workPeople}">
+                {{ scope.row.workPeople ? scope.row.workPeople: '' }}</div>
             </template>
           </el-table-column>
         </el-table>
@@ -303,8 +304,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.dataList.forEach(item => {
-        if (item.workPeople !== undefined) {
           this.listForm.commentText = this.commentText;
           const json = JSON.stringify(this.listForm);
           this.$http.post("lawss/activiti/completeTask", {
@@ -320,10 +319,6 @@ export default {
             }
           }, e => {
           });
-        } else {
-          this.$message.warning("请选择分发负责人");
-        }
-      });
     },
     //批量分发按钮
     batchOperation(id) {

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -72,7 +72,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
+            prop="itemsNum"
             align="center"
             width="200"
             label="条款号">
@@ -84,21 +84,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
+            prop="xcxssrqgj"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
+            prop="zccssrqgj"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -112,7 +112,7 @@
               label="合规">
               <template slot-scope="scope">
                 <el-input
-                  v-model="dataList[scope.$index].complianceReasons"
+                        v-model="scope.row.complianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
@@ -130,7 +130,7 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
-                    v-model="dataList[scope.$index].noCompliance"
+                          v-model="scope.row.noCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
@@ -143,7 +143,7 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
-                    v-model="dataList[scope.$index].countermeasures"
+                          v-model="scope.row.countermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
@@ -156,7 +156,7 @@
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
-                    v-model="dataList[scope.$index].completionTime"
+                          v-model="scope.row.completionTime"
                     type="date"
                     placeholder="选择日期">
                   </el-date-picker>
@@ -174,7 +174,7 @@
               label="合规(具体情况)">
               <template slot-scope="scope">
                 <el-input
-                  v-model="dataList[scope.$index].zcComplianceReasons"
+                        v-model="scope.row.zcComplianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
@@ -191,7 +191,7 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
-                    v-model="dataList[scope.$index].zcNoCompliance"
+                          v-model="scope.row.zcNoCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
@@ -204,7 +204,7 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
-                    v-model="dataList[scope.$index].zcCountermeasures"
+                          v-model="scope.row.zcCountermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
@@ -217,7 +217,7 @@
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
-                    v-model="dataList[scope.$index].zcCompletionTime"
+                          v-model="scope.row.zcCompletionTime"
                     type="date"
                     placeholder="选择日期">
                   </el-date-picker>
@@ -396,6 +396,7 @@ export default {
           pId: this.pId
         }).then(res => {
           if (res) {
+            console.log(res.mesg)
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
           }
@@ -407,37 +408,13 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        console.log(this.listForm)
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
-        this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
-        let children = [];
-        item.breakdownList.forEach(
-          item => {
-            let aa = {
-              key: item.standId,
-              id: item.id,
-              standId: item.itemsNum,
-              itemsNum: item.itemsNum,
-              itemsName: item.itemsName,
-              workPeople: "请选择责任人"
-            };
-            children.push(aa);
-          }
-        );
-        this.dataList.forEach(key => {
-          key["children"] = [];
-          children.forEach(breakDown => {
-            if (key.standId === breakDown.key) {
-              key["children"].push(breakDown);
-            }
-          });
-          if (key["children"].length === 0) {
-            delete key["children"];
-          }
-        });
-        this.listForm.children = children;
+        // this.listForm.dataList = item.dataList;
+        this.dataList = this.listForm.dataList;
+        console.log(this.dataList)
       });
     },
     //保存事件
@@ -446,8 +423,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.dataList.forEach(item => {
-        if (item.workPeople !== undefined) {
           this.listForm.commentText = this.commentText;
           const json = JSON.stringify(this.listForm);
           this.$http.post("lawss/activiti/completeTask", {
@@ -463,10 +438,6 @@ export default {
             }
           }, e => {
           });
-        } else {
-          this.$message.warning("请选择分发负责人");
-        }
-      });
     },
     //标准表格选择框改变
     selectStandChange(data) {

src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue

@@ -1,485 +1,491 @@
 <template>
-  <div class="xmpg2-step7">
-    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
-    </div>
-    <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
-        <process-title>
-          <template slot="title">基础信息</template>
-        </process-title>
-        <el-form
-          :model="listForm"
-          class="label-input-form prc-content-border"
-          label-width="150px"
-        >
-          <el-row :gutter="24">
-            <el-col :span="24">
-              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
-                <el-input
-                  v-model="listForm.projectNumber"
-                  placeholder="请输入项目编号"
-                  clearable
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
-                <el-input
-                  v-model="listForm.projectName"
-                  placeholder="请输入项目名称"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <process-title style="margin-top:5px; margin-bottom: 5px">
-          <template slot="title">填写信息</template>
-        </process-title>
-        <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
-          </el-table-column>
-          <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
-          </el-table-column>
-          <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
-          </el-table-column>
-          <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
-          </el-table-column>
-          <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
-            <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
-              <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="在产产品">
-            <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
-              <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
-        </el-table>
-      </div>
-      <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 class="xmpg2-step7">
+        <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="flex: auto; overflow: auto">
+                <process-title>
+                    <template slot="title">基础信息</template>
+                </process-title>
+                <el-form
+                        :model="listForm"
+                        class="label-input-form prc-content-border"
+                        label-width="150px"
+                >
+                    <el-row :gutter="24">
+                        <el-col :span="24">
+                            <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                                <el-input
+                                        v-model="listForm.projectNumber"
+                                        placeholder="请输入项目编号"
+                                        clearable
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                                <el-input
+                                        v-model="listForm.projectName"
+                                        placeholder="请输入项目名称"
+                                        clearable
+                                ></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+                <process-title style="margin-top:5px; margin-bottom: 5px">
+                    <template slot="title">填写信息</template>
+                </process-title>
+                <el-table
+                        :data="dataList"
+                        style="width: 100%; border: 1px solid #cccccc"
+                        row-key="standId"
+                        height="70%"
+                        border
+                        @selection-change="selectStandChange"
+                        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+                >
+                    <el-table-column
+                            type="selection"
+                            width="55"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="standEnName"
+                            label="标准编号"
+                            width="180"
+                            fixed="left"
+                            align="center"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="standName"
+                            fixed="left"
+                            width="180"
+                            align="center"
+                            label="标准名称"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="itemsNum"
+                            align="center"
+                            width="200"
+                            label="条款号">
+                    </el-table-column>
+                    <el-table-column
+                            prop="itemsName"
+                            width="200"
+                            align="center"
+                            label="条款名称">
+                    </el-table-column>
+                    <el-table-column
+                            prop="xcxssrqgj"
+                            width="200"
+                            align="center"
+                            label="新车型实施日期">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="zccssrqgj"
+                            width="200"
+                            align="center"
+                            label="在产车实施日期">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="productType"
+                            align="center"
+                            label="在研产品">
+                        <el-table-column
+                                prop="complianceReasons"
+                                align="center"
+                                width="160"
+                                label="合规">
+                        </el-table-column>
+                        <el-table-column
+                                align="center"
+                                width="160"
+                                prop="researchNonCompliance"
+                                label="不合规">
+                            <el-table-column
+                                    prop="noCompliance"
+                                    align="center"
+                                    width="160"
+                                    label="不合规项目">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="countermeasures"
+                                    align="center"
+                                    width="160"
+                                    label="应对措施">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="completionTime"
+                                    align="center"
+                                    width="160"
+                                    label="完成时间">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                                </template>
+                            </el-table-column>
+                        </el-table-column>
+                    </el-table-column>
+                    <el-table-column
+                            align="center"
+                            label="在产产品">
+                        <el-table-column
+                                prop="zcComplianceReasons"
+                                align="center"
+                                width="160"
+                                label="合规(具体情况)">
+                        </el-table-column>
+                        <el-table-column
+                                align="center"
+                                width="160"
+                                label="不合规">
+                            <el-table-column
+                                    prop="zcNoCompliance"
+                                    align="center"
+                                    width="160"
+                                    label="不合规项目">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="zcCountermeasures"
+                                    align="center"
+                                    width="160"
+                                    label="应对措施">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="zcCompletionTime"
+                                    align="center"
+                                    width="160"
+                                    label="完成时间">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                                </template>
+                            </el-table-column>
+                        </el-table-column>
+                    </el-table-column>
+                </el-table>
             </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
-    </div>
-    <div class="content" v-show="active === '3'">
-      <div class="flow-list" style="height: 100%">
-        <el-table
-          height="100%"
-          ref="selection"
-          :data="detailData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :no-data-text="listNoDataText"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+            <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 === '3'">
+            <div class="flow-list" style="height: 100%">
+                <el-table
+                        height="100%"
+                        ref="selection"
+                        :data="detailData"
+                        tooltip-effect="dark"
+                        style="width: 100%"
+                        border
+                        row-key="id"
+                        :no-data-text="listNoDataText"
+                        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                >
+                    <el-table-column
+                            type="selection"
+                            width="55"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="name"
+                            label="任务步骤"
+                            align="center"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="assignee"
+                            label="任务受理人"
+                            align="center"
+                    >
+                    </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>
+                <loading :loading="loading">流程列表加载中</loading>
+            </div>
+        </div>
+        <ProcessFooter
+                show-back
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                :approval="true"
+                @back="beforeBack"
+                @submit="handleSubmit"
         >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-          >
-          </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>
-        <loading :loading="loading">流程列表加载中</loading>
-      </div>
+        </ProcessFooter>
     </div>
-    <ProcessFooter
-      show-back
-      show-submit
-      :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :approval="true"
-      @back="beforeBack"
-      @submit="handleSubmit"
-    >
-    </ProcessFooter>
-  </div>
 </template>
 
 <script>
-import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+    import ProcessHeader from "../../components/ProcessHeader";
+    import ProcessFooter from "../../components/ProcessFooter";
+    import ProcessTitle from "../../components/ProcessTitle";
+    import {inboundLiaisonDetail, queryDetail} from "api/process";
 
-export default {
-  name: "xmpg2Step7",
-  components: {
-    ProcessTitle,
-    ProcessHeader,
-    ProcessFooter
-  },
-  data() {
-    return {
-      active: "1",
-      loading: false,
-      // 当前流程类型(1待办/2已办)
-      processType: 1,
-      isSubmit: false,
-      saveLoading: false,
-      //表单的数据
-      listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
-        projectNumber: "",  //项目编号
-        projectName: "",  //项目名称
-        dataList: [], //项目下的标准数据
-        breakdownList: [] //标准下的分解单数据
-      },
-      dataList: [], //展示的标准数据
-      commentText: "", //审批意见
-      detailData: [],//流程历史数据
-      userId: this.$store.getters.userInfo.userId,
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId
+    export default {
+        name: "xmpg2Step7",
+        components: {
+            ProcessTitle,
+            ProcessHeader,
+            ProcessFooter
+        },
+        data() {
+            return {
+                active: "1",
+                loading: false,
+                // 当前流程类型(1待办/2已办)
+                processType: 1,
+                isSubmit: false,
+                saveLoading: false,
+                //表单的数据
+                listForm: {
+                    ffFlag: " ", //1审批通过 其他为驳回
+                    projectNumber: "",  //项目编号
+                    projectName: "",  //项目名称
+                    dataList: [], //项目下的标准数据
+                    breakdownList: [] //标准下的分解单数据
+                },
+                dataList: [], //展示的标准数据
+                commentText: "", //审批意见
+                detailData: [],//流程历史数据
+                userId: this.$store.getters.userInfo.userId,
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId
+            };
+        },
+        methods: {
+            processTable() {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res;
+                }, e => {
+                });
+            },
+            //tab改变
+            handleTabs(type) {
+                this.active = type;
+            },
+            //获取数据
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        if (res) {
+                            const processForm = JSON.parse(res.mesg);
+                            this.getFormFieldList(processForm);
+                        }
+                    }).catch(e => {
+                    });
+                });
+            },
+            //动态表单读取
+            getFormFieldList(item) {
+                this.$nextTick(() => {
+                    this.listForm = JSON.parse(JSON.stringify(item));
+                    this.listForm.prcNum = this.prcNum;
+                    this.listForm.prcName = this.prcName;
+                    this.listForm["id"] = item.id;
+                    this.listForm.dataList = item.dataList;
+                    this.dataList = item.dataList;
+                    this.dataList.distributePerson = item.dataList[0].distributePerson;
+                    this.listForm.breakdownList = item.breakdownList;
+                });
+            },
+            //驳回事件
+            beforeBack() {
+                if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
+                    this.$message.warning('请填写审批意见')
+                } else {
+                    this.listForm.ffFlag = "2";
+                    this.listForm.commentText = this.commentText;
+                    const json = JSON.stringify(this.listForm);
+                    this.$http.post("lawss/activiti/completeTask", {
+                        taskIds: this.taskIds,
+                        userId: this.userId,
+                        json: json
+                    }, {
+                        _this: this
+                    }, res => {
+                        if (res.success) {
+                            this.$message.success(res.message);
+                            this.$router.push("/processCenter");
+                        }
+                    }, e => {
+                    });
+                }
+            },
+            //提交事件
+            handleSubmit() {
+                if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
+                    this.$message.warning('请填写审批意见')
+                } else {
+                    this.listForm.ffFlag = "1";
+                    this.listForm.commentText = this.commentText;
+                    const json = JSON.stringify(this.listForm);
+                    this.$http.post("lawss/activiti/completeTask", {
+                        taskIds: this.taskIds,
+                        userId: this.userId,
+                        json: json
+                    }, {
+                        _this: this
+                    }, res => {
+                        if (res.success) {
+                            this.$message.success(res.message);
+                            this.$router.push("/processCenter");
+                        }
+                    });
+                }
+            },
+        },
+        computed: {
+            listNoDataText() {
+                return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+            }
+        },
+        mounted() {
+            this.processTable();
+            this.getData();
+        },
     };
-  },
-  methods: {
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
-    //tab改变
-    handleTabs(type) {
-      this.active = type;
-    },
-    //获取数据
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg);
-            this.getFormFieldList(processForm);
-          }
-        }).catch(e => {
-        });
-      });
-    },
-    //动态表单读取
-    getFormFieldList(item) {
-      this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum;
-        this.listForm.prcName = this.prcName;
-        this.listForm["id"] = item.id;
-        this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
-        this.listForm.breakdownList = item.breakdownList;
-      });
-    },
-    //驳回事件
-    beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
-    },
-    //提交事件
-    handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
-    }
-  },
-  computed: {
-    listNoDataText() {
-      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
-    }
-  },
-  mounted() {
-    this.processTable();
-    this.getData();
-  }
-};
 </script>
 
 <style lang="less" scoped>
-@import '~@/assets/styles/style';
+    @import '~@/assets/styles/style';
 
-.xmpg2-step7 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
+    .xmpg2-step7 {
+        /deep/ .el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
 
-  .choiceBtn {
-    .el-button--primary {
-      width: 150px;
-    }
-  }
+        .choiceBtn {
+            .el-button--primary {
+                width: 150px;
+            }
+        }
 
-  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;
-      }
-
-      .accessStandardsAndRegulations {
+        position: relative;
         height: 100%;
-      }
-    }
-  }
 
-  .demo-drawer-content {
-    margin-top: 10px;
-  }
-}
+        .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;
+                }
+
+                .accessStandardsAndRegulations {
+                    height: 100%;
+                }
+            }
+        }
+
+        .demo-drawer-content {
+            margin-top: 10px;
+        }
+    }
 </style>

src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue

@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -297,7 +296,7 @@ export default {
       saveLoading: false,
       //表单的数据
       listForm: {
-        BZFlag: " ", //1审批通过 其他为驳回
+        jgFlag: " ", //1审批通过 其他为驳回
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.jgFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
-    }
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.jgFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue

@@ -41,92 +41,98 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
-          border
-          ref="selection"
-          height="70%"
-          style="width: 100%; border:1px solid #ccc"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+                :data="dataList"
+                style="width: 100%; border: 1px solid #cccccc"
+                row-key="standId"
+                height="70%"
+                border
+                @selection-change="selectStandChange"
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+                  type="selection"
+                  width="55"
+                  align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
-            align="center"
-            width="200"
-            label="标准编号">
+                  prop="standEnName"
+                  label="标准编号"
+                  width="180"
+                  fixed="left"
+                  align="center"
+          >
           </el-table-column>
           <el-table-column
-            prop="standName"
-            align="center"
-            width="200"
-            label="标准名称">
+                  prop="standName"
+                  fixed="left"
+                  width="180"
+                  align="center"
+                  label="标准名称"
+          >
           </el-table-column>
           <el-table-column
-            prop="itemNum"
-            align="center"
-            width="200"
-            label="条款号">
+                  prop="itemsNum"
+                  align="center"
+                  width="200"
+                  label="条款号">
           </el-table-column>
           <el-table-column
-            prop="itemsName"
-            width="200"
-            align="center"
-            label="条款名称">
+                  prop="itemsName"
+                  width="200"
+                  align="center"
+                  label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
-            width="200"
-            align="center"
-            label="新车型实施日期">
+                  prop="xcxssrqgj"
+                  width="200"
+                  align="center"
+                  label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
-            width="200"
-            align="center"
-            label="在产车实施日期">
+                  prop="zccssrqgj"
+                  width="200"
+                  align="center"
+                  label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
+                  prop="productType"
+                  align="center"
+                  label="在研产品">
             <el-table-column
-              prop="complianceReasons"
-              align="center"
-              width="160"
-              label="合规">
+                    prop="complianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              prop="researchNonCompliance"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    prop="researchNonCompliance"
+                    label="不合规">
               <el-table-column
-                prop="noCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="noCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="countermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="countermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="completionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="completionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
@@ -134,48 +140,41 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
-            label="在产产品">
+                  align="center"
+                  label="在产产品">
             <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
+                    prop="zcComplianceReasons"
+                    align="center"
+                    width="160"
+                    label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
+                    align="center"
+                    width="160"
+                    label="不合规">
               <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="160"
-                label="不合规项目">
+                      prop="zcNoCompliance"
+                      align="center"
+                      width="160"
+                      label="不合规项目">
               </el-table-column>
               <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
+                      prop="zcCountermeasures"
+                      align="center"
+                      width="160"
+                      label="应对措施">
               </el-table-column>
               <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="160"
-                label="完成时间">
+                      prop="zcCompletionTime"
+                      align="center"
+                      width="160"
+                      label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="workPeople"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -359,42 +358,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.gcFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
-    }
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.gcFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue

@@ -127,7 +127,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'4f71b81686079ba2b7e3739d3994e0af'">查看</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>

src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue

@@ -127,7 +127,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -124,7 +124,7 @@
           <el-table-column :label="$t('m.operation')" align="center" width="50">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
-                <el-dropdown trigger="click" @command="handleCommand">
+                <el-dropdown trigger="click" @command="handleCommand" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
@@ -600,6 +600,72 @@ export default {
                   prcType: row.prcType
                 }
               })
+            } else if(row.taskInfo === '分发负责人审批') {
+              this.$router.push({
+                name: 'xmpg2Step7',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '架构经理审批') {
+              this.$router.push({
+                name: 'xmpg2Step8',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '工程经理审批') {
+              this.$router.push({
+                name: 'xmpg2Step9',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '标准法规部经理审批') {
+              this.$router.push({
+                name: 'xmpg2Step10',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '汇总审批') {
+              this.$router.push({
+                name: 'xmpg2Step11',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '标准法规部部长审批') {
+              this.$router.push({
+                name: 'xmpg2Step12',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
             }
             break
         //未符合项整改流程

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -127,7 +127,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '办理']" v-btn-permission="'fa19fb2dc2cf3055a64732dab6c40cb9'">办理</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -212,7 +212,6 @@ export default {
       this.queryProcess()
     },
     dealWith (row) { // 办理
-      debugger
       //草稿办理待开发
       const { prcType, id } = row
       const mes = JSON.parse(row.mes)
@@ -251,6 +250,17 @@ export default {
             }
           })
           break
+        // 征求意见流程
+        case '3':
+          this.$router.push({
+            name: 'bzzqyjStep1-1',
+            query: {
+              type: '3',
+              processName: '标准征求意见流程',
+              bpnId: id
+            }
+          })
+          break
         case '4':
           this.$router.push({
             name: 'bzqdfbStep1-1',

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -117,16 +117,6 @@
               }}</span>
           </template>
         </el-table-column>
-<!--        <el-table-column
-          prop="applicationScope"
-          label="适用领域"
-          align="center">
-          <template slot-scope="scope">
-            <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-          </template>
-        </el-table-column>-->
         <el-table-column
           prop="updateTime"
           label="更新时间"
@@ -269,6 +259,7 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records
+        this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
 

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -266,6 +266,7 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+        current: 1,
         page: 1,
         pageSize: this.pageSize,
         ...this.sarSarAccessEOSearch,
@@ -274,6 +275,7 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records;
+        this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total;
       }, e => {
       });

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -267,7 +267,7 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
-        page: this.page,
+        page: 1,
         pageSize: this.pageSize,
         ...this.sarSarAccessEOSearch,
         sortKey: 2
@@ -275,6 +275,7 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records;
+        this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
       });

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -80,55 +80,13 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item  label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
+            <el-form-item  label="标准名称" class="search-item">
               <el-input
                   v-model="sarAccessInfoSearch.standName"
                   placeholder="请输入"
                   :maxlength="100"
               ></el-input>
             </el-form-item>
-            <el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
-                <el-option
-                    v-for="item in energyKindOptions"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.askType">
-                <el-option
-                    v-for="item in accessSarTypeOptions"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="国家/地区" class="search-item" v-show="isListType">
-              <el-select
-                  v-model="sarAccessInfoSearch.countryArea"
-                  placeholder="请选择"
-                  filterable
-              >
-                <el-option
-                    v-for="item in drawerCountryOptions"
-                    :value="item.value"
-                    :key="item.value"
-                    :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
-              <el-input
-                  v-model="sarAccessInfoSearch.detailedListName"
-                  placeholder="请输入"
-                  :maxlength="100"
-              ></el-input>
-            </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                   type="primary"
@@ -158,46 +116,23 @@
         </div>
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
-        <el-form  :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="文本状态"  v-show="!isListType">
-            <el-select
-              v-model="sarAccessInfoSearch.textStatus"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in textStatusOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="发布日期"  v-show="!isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.issueTime"
-              type="date"
-              value-format="yyyy-MM-DD"
-              size="small"
-              placeholder="选择发布日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="更新人"  v-show="isListType">
+        <el-form  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
+          <el-form-item label="标准号" class="labelBox">
             <el-input
-              v-model="sarAccessInfoSearch.standName"
+              v-model="sarAccessInfo.standNumber"
               placeholder="请输入"
-              :maxlength="100"
-              size="small"/>
-          </el-form-item>
-          <el-form-item label="更新时间"  v-show="isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.modifyTime"
-              type="date"
               size="small"
-              value-format="yyyy-MM-DD"
-              placeholder="选择更新日期">
-            </el-date-picker>
+              clearable/>
+          </el-form-item>
+          <el-form-item label="标准名称" class="labelBox">
+            <el-input
+              v-model="sarAccessInfo.standName"
+              placeholder="请输入"
+              size="small"
+              clearable/>
+          </el-form-item>
+          <el-form-item>
+            <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -243,13 +178,12 @@
               width="180px"
               label="标准号">
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+              <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</span>
             </template>
           </el-table-column>
           <el-table-column
               prop="standName"
               label="标准名称"
-              width="260px"
           >
           </el-table-column>
           <el-table-column
@@ -287,52 +221,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-table
-            v-show="isListType"
-            :data="sarAccessInfoSearchList"
-            style="width: 100%"
-            border
-            height="300px"
-            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-            @selection-change="accessSarTypeSelect"
-            ref="accessTypeSelect"
-        >
-          <el-table-column
-              type="selection"
-              width="55"
-              align="center">
-          </el-table-column>
-          <el-table-column
-              prop="country"
-              label="国家/地区"
-              align="center">
-            <template slot-scope="scope">
-            <span v-if="scope.row.country !== null && scope.row.country.indexOf(',')  > 0">
-              <span>{{ scope.row.country }}</span>
-            </span>
-              <span v-else>{{ countryAreaMap[scope.row.country] }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="detailedListName"
-              label="清单名称"
-              align="center">
-          </el-table-column>
-          <el-table-column
-              prop="modifyTime"
-              label="更新时间"
-              align="center">
-            <template slot-scope="scope">
-              <div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="uname"
-              label="更新人"
-              align="center">
-          </el-table-column>
-        </el-table>
         <pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
                     @pageSizeChange="drawerPageSizeChange"></pagination>
         <loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -354,6 +242,7 @@
             v-btn-permission="''"
         ><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
+      <!--   清单条目的列表页   -->
       <el-table
           ref="entryTable"
           :data="sarAccessInfoList"
@@ -541,21 +430,19 @@
       >
       <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
           <el-form-item label="标准号">
-            <el-input  v-model.trim="editRowData.standNumber"  :disabled="true">
-<!--              <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
-            </el-input>
+            <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
           </el-form-item>
           <el-form-item label="标准名称" prop="standName">
-            <el-input v-model.trim="editRowData.standName" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.standName" :disabled="true"/>
           </el-form-item>
           <el-form-item label="英文名称" prop="standEnName">
-            <el-input v-model.trim="editRowData.standEnName" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
           </el-form-item>
           <el-form-item label="适用车型" prop="typeApplicable">
-            <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
           </el-form-item>
           <el-form-item label="能源类型" prop="nylx">
-            <el-input v-model.trim="editRowData.nylx" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
           </el-form-item>
           <el-form-item label="标准实施日期" prop="putTime">
             <el-date-picker
@@ -582,22 +469,22 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="责任部门" prop="zrbm">
-            <el-input v-model.trim="editRowData.zrbm" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
           </el-form-item>
           <el-form-item label="适用产品线" prop="sycpx">
-            <el-input v-model.trim="editRowData.sycpx" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
           </el-form-item>
           <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
-            <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
           </el-form-item>
           <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
-            <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
           </el-form-item>
           <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
-            <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
           </el-form-item>
           <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
-            <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
           </el-form-item>
         </el-form>
       <div class="demo-drawer-footer">
@@ -746,19 +633,23 @@ export default {
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
         //{value: 'FOREIGN_LAWS', label: '国内外政策'},
         // {value: 'BUSINESS', label: '企业标准 '},
-        {value: 'TEMP', label: '标准法规清单 '}
+        // {value: 'TEMP', label: '标准法规清单 '}
       ],
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        countryArea: '', // 国家
-        issueTime: '',
         standName: '',
-        textStatus: '',
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: ''
+      },
+      sarAccessInfo: {
+        id: '',
+        standNumber: '',
+        standName: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -1082,8 +973,8 @@ export default {
         return false
       }
       // 判断文件上传大小
-      if (file.size / 1024 / 1024 > 300) {
-        this.$message.warning('文件' + file.name + '大小不能超过300M')
+      if (file.size / 1024 / 1024 > 200) {
+        this.$message.warning('文件' + file.name + '大小不能超过200M')
         return false
       }
       return true
@@ -1104,15 +995,11 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
-      this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.sarAccessInfoSearch.applyArctic = '' // 能源种类
-      this.sarAccessInfoSearch.keywords = '' // 关键字
       this.sarAccessInfoSearch.askType = '' // 监管类型
-      this.sarAccessInfoSearch.detailedListName = '' // 清单名称
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
       this.sarAccessInfoSearch.standName = ''
-      this.sarAccessInfoSearch.putTime = ''
-      this.sarAccessInfoSearch.textStatus = ''
+      this.sarAccessInfo.standName = ''
+      this.sarAccessInfo.standNumber = ''
       this.isListType = false
       this.selectLawsStands()
     },
@@ -1281,19 +1168,19 @@ export default {
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id == item.id
-          })
+              return items.id == item.id
+            })
           if(addList > -1){
-            this.$message.warning('请勿添加重复数据')
-            this.$refs.accessTypeSelect.clearSelection()
-            this.$refs.entryTable.clearSelection()
-            this.$refs.searchTable.clearSelection()
-          } else{
-            this.sarAccessInfoList.push(item)
-            this.$refs.accessTypeSelect.clearSelection()
-            this.$refs.entryTable.clearSelection()
-            this.$refs.searchTable.clearSelection()
-          }
+              this.$message.warning('请勿添加重复数据')
+              // this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            } else{
+              this.sarAccessInfoList.push(item)
+              // this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            }
         })
       } else {
         this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
@@ -1442,12 +1329,16 @@ export default {
               _this: this,
               loading: 'loadData'
             }, res => {
-              if (res.ok) {
-                this.$message.success('新增成功')
-                this.isNext = true
-                this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
-                })
+              if (this.sarAccessInfoList.length !== 0) {
+                if (res.ok) {
+                  this.$message.success('新增成功')
+                  this.isNext = true
+                  this.$router.push({
+                    name: 'AccessStandardsAndRegulations'
+                  })
+                }
+              } else {
+                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
               }
             }, e => {
             })
@@ -1474,6 +1365,12 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1482,18 +1379,71 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
+        this.drawerTotal = res.data.count
+      }, e => {
+      })
+    },
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
+      StandardsInfoPage(this.sarAccessInfo).then(res =>{
+        this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
         this.drawerTotal = res.data.list.length
       }, e => {
@@ -1507,16 +1457,29 @@ export default {
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
       this.selectedAccInfoSearchList.forEach(item => {
-        this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-        this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-        this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-        this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-        this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-        this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-        this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-        this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-        this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-        this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        if (item.attrInfoMap === null) {
+          this.$set(item, 'zccssrqgj', '')
+          this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'sycpx', '')
+          this.$set(item, 'typeApplicable', '')
+          this.$set(item, 'nylx', '')
+          this.$set(item, 'zrbm', '')
+          this.$set(item, 'cycvppsbm', '')
+          this.$set(item, 'cycvppscn', '')
+          this.$set(item, 'kccvppsbm', '')
+          this.$set(item, 'kccvppscn', '')
+        }else {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        }
       })
       this.selectedAccInfoSearchList.forEach(item => {
         // 责任部门转换
@@ -1915,7 +1878,7 @@ export default {
     },
     // 点击查看
     handlePreview (data) {
-      let routerName = data.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+      let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
@@ -2028,6 +1991,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
       }, e => {
       })
@@ -2101,8 +2087,8 @@ export default {
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
         this.sarAccessInfoSearch.validFlag = 0
-        this.getFileInfo()
         this.getData()
+        this.getFileInfo()
         this.selectLawsStands()
       })
     } else {
@@ -2169,6 +2155,12 @@ export default {
     text-align: right;
   }
 }
+.labelBox {
+  /deep/ .el-form-item__label {
+    padding-right: 5px;
+    padding-left: 10px;
+  }
+}
 .un-select {
   user-select: none;
 }

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -191,13 +191,13 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="code"
+            prop="standNumber"
             fixed="left"
             width="180px"
             align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+              <span class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -491,6 +491,13 @@ export default {
         _this: this
       }, res => {
         this.standinfoList = res.data;
+        this.standinfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
         this.total = res.data.total;
       }, e => {
 
@@ -628,7 +635,7 @@ export default {
         name: "OtherStandardDetails",
         params: {
           id: data.id,
-          pageType: data.sarType
+          pageType: data.standType
         }
       });
       window.open(routeUrl.href, "_blank");
@@ -660,10 +667,10 @@ export default {
     //
     changeState(row) {
       let routeUrl = this.$router.resolve({
-        name: "ComplianceDetails",
+        name: "OtherStandardDetails",
         query: {
-          sarId: row.resId,
-          sarType: row.sarState
+          id: data.id,
+          pageType: this.standType
         }
       });
       window.open(routeUrl.href, "_blank");

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -65,40 +65,13 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
+            <el-form-item label="标准名称"  class="search-item">
               <el-input
                 v-model="sarAccessInfoSearch.standName"
                 placeholder="请输入"
                 :maxlength="100"
               ></el-input>
             </el-form-item>
-            <el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
-                <el-option
-                  v-for="item in energyKindOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.askType">
-                <el-option
-                  v-for="item in accessSarTypeOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
-              <el-input
-                v-model="sarAccessInfoSearch.detailedListName"
-                placeholder="请输入"
-                :maxlength="100"
-              ></el-input>
-            </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                 type="primary"
@@ -115,7 +88,11 @@
                 @click="clearSearchLaws">清空</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+                <i class="iconfont">&#xe7a5;</i>
+                高级查询
+              </el-button>
+              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
@@ -124,54 +101,23 @@
         </div>
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
-        <el-form  :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
-          <el-form-item label="文本状态"  v-show="!isListType">
-            <el-select
-              v-model="sarAccessInfoSearch.textStatus"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in textStatusOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="发布日期"  v-show="!isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.issueTime"
-              type="date"
-              value-format="yyyy-MM-DD"
-              size="small"
-              placeholder="选择发布日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="项目类别"  v-show="isListType">
+        <el-form  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
+          <el-form-item label="标准号" class="labelBox">
             <el-input
-              size="small"
-              v-model="sarAccessInfoSearch.standSystem"
+              v-model="sarAccessInfo.standNumber"
               placeholder="请输入"
-              :maxlength="100"
-            ></el-input>
+              size="small"
+              clearable/>
           </el-form-item>
-          <el-form-item label="更新人"  v-show="isListType">
+          <el-form-item label="标准名称" class="labelBox">
             <el-input
-              v-model="sarAccessInfoSearch.standName"
+              v-model="sarAccessInfo.standName"
               placeholder="请输入"
-              :maxlength="100"
-              size="small"/>
-          </el-form-item>
-          <el-form-item label="更新时间"  v-show="isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.modifyTime"
-              type="date"
               size="small"
-              value-format="yyyy-MM-DD"
-              placeholder="选择更新日期">
-            </el-date-picker>
+              clearable/>
+          </el-form-item>
+          <el-form-item>
+            <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -223,7 +169,6 @@
           <el-table-column
             prop="standName"
             label="标准名称"
-            width="260px"
           >
           </el-table-column>
           <el-table-column
@@ -261,46 +206,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-table
-          v-show="isListType"
-          :data="sarAccessInfoSearchList"
-          style="width: 100%"
-          border
-          height="300px"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-          @selection-change="accessSarTypeSelect"
-          ref="accessTypeSelect"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="detailedList"
-            label="清单类别"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="detailedListName"
-            label="清单名称"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="modifyTime"
-            label="更新时间"
-            align="center">
-            <template slot-scope="scope">
-              <div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="uname"
-            label="更新人"
-            align="center">
-          </el-table-column>
-        </el-table>
         <pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
                     @pageSizeChange="drawerPageSizeChange"></pagination>
         <loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -405,16 +310,6 @@
           width="210px"
           align="center"
           label="责任部门">
-          <template slot-scope="scope">
-            <span
-              v-for="(item, index) in zrbmOptions"
-              :key="index"
-              :value="item.value"
-              v-if="scope.row.value == item.value"
-            >
-              {{ item.label }}
-            </span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -451,7 +346,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" align="center" label="操作">
+        <el-table-column width="240" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -465,6 +360,12 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
+            <el-button
+              size="small"
+              @click="editTghisRow(scope.row)"
+              class="common-button-default"
+              type="warning"
+            >编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -501,6 +402,90 @@
         </div>
       </el-upload>
     </el-dialog>
+    <!--编辑-->
+    <el-drawer
+      title="编辑清单条目"
+      :visible.sync="drawerEdit"
+      :wrapperClosable="false"
+      size="800px"
+    >
+      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
+        <el-form-item label="标准号">
+          <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准名称" prop="standName">
+          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="英文名称" prop="standEnName">
+          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用车型" prop="typeApplicable">
+          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="nylx">
+          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准实施日期" prop="putTime">
+          <el-date-picker
+            v-model.trim="editRowData.putTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.zccssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.xcxssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="责任部门" prop="zrbm">
+          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="sycpx">
+          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
+          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
+          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
+          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
+        </el-form-item>
+      </el-form>
+      <div class="demo-drawer-footer">
+        <el-button
+          type="primary"
+          class="common-button-primary"
+          size="mini"
+          icon="el-icon-check"
+          @click="saveInfo"
+        >提交</el-button
+        >
+        <el-button
+          size="mini"
+          icon="el-icon-close"
+          class="common-button-default"
+          @click="cancelInfo"
+        >取消</el-button
+        >
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -525,7 +510,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
-import {dicTypeData} from "@/api/unqualProcess";
+import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess";
 export default {
   name: 'OtherAddEit',
   components: {
@@ -556,6 +541,26 @@ export default {
       zrbmMap: {},
       sycpxMap: {},
       selectSearch : [],
+      // 编辑抽屉状态
+      drawerEdit: false,
+      // 编辑框数据
+      editRowData: {
+        id: '',
+        standName: '',
+        standSortShow:'',
+        standEnName: '',
+        typeApplicable: '',
+        nylx: '',
+        putTime: '',
+        zccssrqgj: '',
+        xcxssrqgj: '',
+        zrbm: '',
+        sycpx: '',
+        cycvppsbm: '',
+        cycvppscn: '',
+        kccvppsbm: '',
+        kccvppscn: ''
+      },
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -607,18 +612,14 @@ export default {
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
-        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        // {value: 'FOREIGN_LAWS', label: '国内外政策'},
         // {value: 'BUSINESS', label: '企业标准 '},
-        {value: 'TEMP', label: '标准法规清单 '}
+        // {value: 'TEMP', label: '标准法规清单 '}
       ],
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        countryArea: '', // 国家
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
+        standName: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -626,6 +627,17 @@ export default {
         validFlag: 0,
         advanceSearchVOStr: ''
       },
+      sarAccessInfo: {
+        id: '',
+        standName: '',
+        standNumber: '',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: ''
+      },
       moreSearchBtn: true, // 多属性搜索按钮 状态
       showTableFlag: true, // 显示添加列表 状态
       sarAccessInfoSearchList: [], // 数据搜索 table列表数据
@@ -855,6 +867,9 @@ export default {
   methods: {
     // 高级检索
     selectMoreBtn () {
+      this.showSelectBox = !this.showSelectBox
+      this.showTableFlag = false
+      this.selectLawsStands()
     },
     // 法规维护人树
     getDept () {
@@ -945,11 +960,10 @@ export default {
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
       this.sarAccessInfoSearch.standName = ''
+      this.sarAccessInfo.standName = ''
+      this.sarAccessInfo.standNumber = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.sarAccessInfoSearch.applyArctic = '' // 能源种类
-      this.sarAccessInfoSearch.keywords = '' // 关键字
       this.sarAccessInfoSearch.askType = '' // 监管类型
-      this.sarAccessInfoSearch.detailedListName = '' // 清单名称
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
       this.isListType = false
       this.selectLawsStands()
@@ -1118,17 +1132,18 @@ export default {
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;
+
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id == item.id
-          })
+              return items.id == item.id
+            })
           if(addList > -1){
             this.$message.warning('请勿添加重复数据')
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           } else{
             this.sarAccessInfoList.push(item)
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           }
@@ -1165,6 +1180,22 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
+    // 编辑按钮
+    editTghisRow(row) {
+      this.rowList = row
+      this.editRowData = this.rowList
+      this.editRowData.standNumber = this.rowList.standNumber
+      this.drawerEdit = true
+    },
+    // 抽屉取消按钮
+    cancelInfo() {
+      this.drawerEdit = false
+    },
+    // 抽屉提交按钮
+    saveInfo() {
+      this.rowList = this.editRowData
+      this.drawerEdit = false
+    },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
       this.importmodalFlag = true
@@ -1222,12 +1253,30 @@ export default {
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []
+          let rowlist1 = []
+          let rowlist2 = []
+          let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
+            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].putTime)
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+            }else {
+              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+            }
           }
           rowlist = rowlist.join(',')
+          rowlist1 = rowlist1.join(',')
+          rowlist2 = rowlist2.join(',')
+          rowlist3 = rowlist3.join(',')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
+          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
+          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
+          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1246,12 +1295,16 @@ export default {
               _this: this,
               loading: 'loadData'
             }, res => {
-              if (res.ok) {
-                this.$message.success('新增成功')
-                this.isNext = true
-                this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
-                })
+              if (this.sarAccessInfoList.length !== 0) {
+                if (res.ok) {
+                  this.$message.success('新增成功')
+                  this.isNext = true
+                  this.$router.push({
+                    name: 'AccessStandardsAndRegulations'
+                  })
+                }
+              }else {
+                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
               }
             }, e => {
             })
@@ -1278,9 +1331,13 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
-        _this: this
-      }, res =>{
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
+      StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
@@ -1288,22 +1345,75 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
+        this.drawerTotal = res.data.count
+      }, e => {
+      })
+    },
+    // 高级检索查询按钮
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
+      StandardsInfoPage(this.sarAccessInfo).then(res =>{
+        this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
         this.drawerTotal = res.data.list.length
       }, e => {
-
       })
     },
     // 数据搜索table判断checked状态
@@ -1314,16 +1424,29 @@ export default {
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
       this.selectedAccInfoSearchList.forEach(item => {
-        this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-        this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-        this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-        this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-        this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-        this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-        this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-        this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-        this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-        this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        if (item.attrInfoMap === null) {
+          this.$set(item, 'zccssrqgj', '')
+          this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'sycpx', '')
+          this.$set(item, 'typeApplicable', '')
+          this.$set(item, 'nylx', '')
+          this.$set(item, 'zrbm', '')
+          this.$set(item, 'cycvppsbm', '')
+          this.$set(item, 'cycvppscn', '')
+          this.$set(item, 'kccvppsbm', '')
+          this.$set(item, 'kccvppscn', '')
+        }else {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        }
       })
       this.selectedAccInfoSearchList.forEach(item => {
         // 责任部门转换
@@ -1722,13 +1845,13 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (item) {
-      let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+    handlePreview (data) {
+      let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
-          id: item.resId,
-          pageType: item.sarType
+          id: data.id,
+          pageType: this.sarAccessInfoSearch.dataSource
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1837,6 +1960,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
       }, e => {
 
@@ -1987,6 +2133,12 @@ export default {
     text-align: right;
   }
 }
+.labelBox {
+  /deep/ .el-form-item__label {
+    padding-right: 5px;
+    padding-left: 10px;
+  }
+}
 .un-select {
   user-select: none;
 }

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -65,40 +65,13 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
+            <el-form-item label="标准名称" class="search-item">
               <el-input
                 v-model="sarAccessInfoSearch.standName"
                 placeholder="请输入"
                 :maxlength="100"
               ></el-input>
             </el-form-item>
-            <el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
-                <el-option
-                  v-for="item in energyKindOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.askType">
-                <el-option
-                  v-for="item in accessSarTypeOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
-              <el-input
-                v-model="sarAccessInfoSearch.detailedListName"
-                placeholder="请输入"
-                :maxlength="100"
-              ></el-input>
-            </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                 type="primary"
@@ -128,54 +101,23 @@
         </div>
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
-        <el-form  :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
-          <el-form-item label="文本状态"  v-show="!isListType">
-            <el-select
-              v-model="sarAccessInfoSearch.textStatus"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in textStatusOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="发布日期"  v-show="!isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.issueTime"
-              type="date"
-              value-format="yyyy-MM-DD"
-              size="small"
-              placeholder="选择发布日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="项目名称"  v-show="isListType">
+        <el-form  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
+          <el-form-item label="标准号" class="labelBox">
             <el-input
-              size="small"
-              v-model="sarAccessInfoSearch.standSystem"
+              v-model="sarAccessInfo.standNumber"
               placeholder="请输入"
-              :maxlength="100"
-            ></el-input>
+              size="small"
+              clearable/>
           </el-form-item>
-          <el-form-item label="更新人"  v-show="isListType">
+          <el-form-item label="标准名称" class="labelBox">
             <el-input
-              v-model="sarAccessInfoSearch.standName"
+              v-model="sarAccessInfo.standName"
               placeholder="请输入"
-              :maxlength="100"
-              size="small"/>
-          </el-form-item>
-          <el-form-item label="更新时间"  v-show="isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.modifyTime"
-              type="date"
               size="small"
-              value-format="yyyy-MM-DD"
-              placeholder="选择更新日期">
-            </el-date-picker>
+              clearable/>
+          </el-form-item>
+          <el-form-item>
+            <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -227,7 +169,6 @@
           <el-table-column
             prop="standName"
             label="标准名称"
-            width="260px"
           >
           </el-table-column>
           <el-table-column
@@ -265,46 +206,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-table
-          v-show="isListType"
-          :data="sarAccessInfoSearchList"
-          style="width: 100%"
-          border
-          height="300px"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-          @selection-change="accessSarTypeSelect"
-          ref="accessTypeSelect"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="projectName"
-            label="项目名称"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="detailedListName"
-            label="清单名称"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="modifyTime"
-            label="更新时间"
-            align="center">
-            <template slot-scope="scope">
-              <div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="uname"
-            label="更新人"
-            align="center">
-          </el-table-column>
-        </el-table>
         <pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
                     @pageSizeChange="drawerPageSizeChange"></pagination>
         <loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -445,7 +346,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" align="center" label="操作">
+        <el-table-column width="240" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -459,6 +360,12 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
+            <el-button
+              size="small"
+              @click="editTghisRow(scope.row)"
+              class="common-button-default"
+              type="warning"
+            >编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -495,6 +402,89 @@
         </div>
       </el-upload>
     </el-dialog>
+    <el-drawer
+      title="编辑清单条目"
+      :visible.sync="drawerEdit"
+      :wrapperClosable="false"
+      size="800px"
+    >
+      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
+        <el-form-item label="标准号">
+          <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准名称" prop="standName">
+          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="英文名称" prop="standEnName">
+          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用车型" prop="typeApplicable">
+          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="nylx">
+          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准实施日期" prop="putTime">
+          <el-date-picker
+            v-model.trim="editRowData.putTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.zccssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.xcxssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="责任部门" prop="zrbm">
+          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="sycpx">
+          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
+          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
+          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
+          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
+        </el-form-item>
+      </el-form>
+      <div class="demo-drawer-footer">
+        <el-button
+          type="primary"
+          class="common-button-primary"
+          size="mini"
+          icon="el-icon-check"
+          @click="saveInfo"
+        >提交</el-button
+        >
+        <el-button
+          size="mini"
+          icon="el-icon-close"
+          class="common-button-default"
+          @click="cancelInfo"
+        >取消</el-button
+        >
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -519,7 +509,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
-import {dicTypeData} from "@/api/unqualProcess";
+import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess"
 export default {
   name: 'OtherAddEit',
   components: {
@@ -565,6 +555,26 @@ export default {
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
+      // 编辑抽屉状态
+      drawerEdit: false,
+      // 编辑框数据
+      editRowData: {
+        id: '',
+        standName: '',
+        standSortShow:'',
+        standEnName: '',
+        typeApplicable: '',
+        nylx: '',
+        putTime: '',
+        zccssrqgj: '',
+        xcxssrqgj: '',
+        zrbm: '',
+        sycpx: '',
+        cycvppsbm: '',
+        cycvppscn: '',
+        kccvppsbm: '',
+        kccvppscn: ''
+      },
       // 新增、编辑 基础信息验证条件
       sarAccessEORules: {
         type: [
@@ -601,18 +611,25 @@ export default {
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
-        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        // {value: 'FOREIGN_LAWS', label: '国内外政策'},
         // {value: 'BUSINESS', label: '企业标准 '},
-        {value: 'TEMP', label: '标准法规清单 '}
+        // {value: 'TEMP', label: '标准法规清单 '}
       ],
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        countryArea: '', // 国家
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
+        standName: '',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: ''
+      },
+      sarAccessInfo: {
+        id: '',
+        standName: '',
+        standNumber: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -943,11 +960,10 @@ export default {
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
       this.sarAccessInfoSearch.standName = ''
+      this.sarAccessInfo.standName = ''
+      this.sarAccessInfo.standNumber = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.sarAccessInfoSearch.applyArctic = '' // 能源种类
-      this.sarAccessInfoSearch.keywords = '' // 关键字
       this.sarAccessInfoSearch.askType = '' // 监管类型
-      this.sarAccessInfoSearch.detailedListName = '' // 清单名称
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
       this.isListType = false
       this.selectLawsStands()
@@ -1117,16 +1133,16 @@ export default {
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id == item.id
-          })
+              return items.id == item.id
+            })
           if(addList > -1){
             this.$message.warning('请勿添加重复数据')
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           } else{
             this.sarAccessInfoList.push(item)
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           }
@@ -1163,6 +1179,22 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
+    // 编辑按钮
+    editTghisRow(row) {
+      this.rowList = row
+      this.editRowData = this.rowList
+      this.editRowData.standNumber = this.rowList.standNumber
+      this.drawerEdit = true
+    },
+    // 抽屉取消按钮
+    cancelInfo() {
+      this.drawerEdit = false
+    },
+    // 抽屉提交按钮
+    saveInfo() {
+      this.rowList = this.editRowData
+      this.drawerEdit = false
+    },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
       this.importmodalFlag = true
@@ -1220,12 +1252,30 @@ export default {
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []
+          let rowlist1 = []
+          let rowlist2 = []
+          let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
+            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].putTime)
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+            }else {
+              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+            }
           }
           rowlist = rowlist.join(',')
+          rowlist1 = rowlist1.join(',')
+          rowlist2 = rowlist2.join(',')
+          rowlist3 = rowlist3.join(',')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
+          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
+          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
+          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1244,12 +1294,16 @@ export default {
               _this: this,
               loading: 'loadData'
             }, res => {
-              if (res.ok) {
-                this.$message.success('新增成功')
-                this.isNext = true
-                this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
-                })
+              if (this.sarAccessInfoList.length !== 0) {
+                if (res.ok) {
+                  this.$message.success('新增成功')
+                  this.isNext = true
+                  this.$router.push({
+                    name: 'AccessStandardsAndRegulations'
+                  })
+                }
+              }else {
+                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
               }
             }, e => {
             })
@@ -1276,9 +1330,13 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
-        _this: this
-      }, res =>{
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
+      StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
@@ -1286,10 +1344,75 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
+        })
+        this.drawerTotal = res.data.count
+      }, e => {
+      })
+    },
+    /** 高级查询查询按钮*/
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
+      StandardsInfoPage(this.sarAccessInfo).then(res =>{
+        this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
         this.drawerTotal = res.data.list.length
       }, e => {
-
       })
     },
     // 数据搜索table判断checked状态
@@ -1300,16 +1423,29 @@ export default {
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
       this.selectedAccInfoSearchList.forEach(item => {
-        this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-        this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-        this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-        this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-        this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-        this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-        this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-        this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-        this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-        this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        if (item.attrInfoMap === null) {
+          this.$set(item, 'zccssrqgj', '')
+          this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'sycpx', '')
+          this.$set(item, 'typeApplicable', '')
+          this.$set(item, 'nylx', '')
+          this.$set(item, 'zrbm', '')
+          this.$set(item, 'cycvppsbm', '')
+          this.$set(item, 'cycvppscn', '')
+          this.$set(item, 'kccvppsbm', '')
+          this.$set(item, 'kccvppscn', '')
+        }else {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        }
       })
       this.selectedAccInfoSearchList.forEach(item => {
         // 责任部门转换
@@ -1710,13 +1846,13 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (item) {
-      let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+    handlePreview (data) {
+      let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
-          id: item.resId,
-          pageType: item.sarType
+          id: data.id,
+          pageType: this.sarAccessInfoSearch.dataSource
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1827,16 +1963,29 @@ export default {
           }
         })
         this.sarAccessInfoSearchList.forEach(item => {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
       }, e => {
 
@@ -1987,6 +2136,12 @@ export default {
     text-align: right;
   }
 }
+.labelBox {
+  /deep/ .el-form-item__label {
+    padding-right: 5px;
+    padding-left: 10px;
+  }
+}
 .un-select {
   user-select: none;
 }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -10,7 +10,9 @@
         <el-tree
                 ref="tree"
                 node-key="id"
-                class="filter-tree"
+                class="tree-line"
+                icon-class="icon-tree"
+                :indent="0"
                 :props="props"
                 :data="treeList"
                 highlight-current
@@ -19,7 +21,7 @@
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                        <span> {{ node.label}} </span>
+                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
                         <span>
                           <el-button
                                   type="text"
@@ -188,22 +190,21 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="xcxssrq"
+              prop="XCXSSRQ"
               sortable="custom"
               width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
+                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
-              prop="zccssrq"
+              prop="ZCCSSRQ"
               sortable="custom"
               width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
-
+                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -440,7 +441,7 @@
                   ></custom-date-pick-group>
                 </template>
                 <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
-                  <template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'BYYBJ' || field.attrField === 'CBBH'">
+                  <template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'CBBH' || field.attrField === 'BFDTBZ'">
                     <custom-input-for-standards
                       :key="field.attrField"
                       :config="field"
@@ -503,6 +504,14 @@
                             ></el-input>
                         </el-form-item>
                     </template>
+                    <template v-else-if="field.attrField === 'BBFDTBZ' || field.attrField === 'BYYBJ'">
+                        <custom-input
+                                :key="field.attrField"
+                                :config="field"
+                                v-model="sarStandardsInfoEO[field.attrField]"
+                                :disabled="true"
+                        ></custom-input>
+                    </template>
                     <template v-else>
                         <custom-input
                                 :key="field.attrField"
@@ -2516,7 +2525,6 @@ export default {
           console.log(item, 'itemitemitemitem')
           const formFieldList = this.formFieldList
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
-          console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答')
           if(this.sarStandardsInfoEO.standSystem){
               this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
           }
@@ -2679,10 +2687,11 @@ export default {
       },
       // 树节点鼠标移入移出
       mouseenter(data){
-          console.log(data)
-          this.$set(data, 'show', true)
-          if(data.parentId !== null){
-              this.$set(data, 'showDel', true)
+          if(data.menuName !== '我的收藏'){
+              this.$set(data, 'show', true)
+              if(data.parentId !== null){
+                  this.$set(data, 'showDel', true)
+              }
           }
       },
       mouseleave(data){
@@ -3362,8 +3371,8 @@ export default {
                 this.isSubmit = false
                 if (res.ok) {
                   this.personCollect.collectType = 'INLAND_STAND'
-                  this.personCollect.id = this.id
-                  this.personCollect.collectResId = this.collectId
+                  this.personCollect.id = this.collectId
+                  this.personCollect.collectResId = this.id
                   this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')'
                   this.personCollect.userId = this.$store.getters.userInfo.userId
                   this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {
@@ -3431,8 +3440,9 @@ export default {
       formData.nowOrder = this.nowOrder
       formData.nowOrderBy = this.nowOrderBy
       // formData.orderBy = this.orderBy
+        console.log(this.selectSarMenu.id)
       // 处理我的收藏和个性化标签传参
-      if (this.selectSarMenu.id === 'wdsc') {
+      if (this.selectSarMenu.menuName === '我的收藏') {
         formData.menuId = undefined
         formData.labelMenuId = undefined
         formData.collectMenuId = 'wdsc'
@@ -3472,6 +3482,7 @@ export default {
             }
           }
           this.stahndinfoList = res.data.list
+          console.log(this.stahndinfoList)
           this.total = res.data.count
           if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
             this.pageChange(1)
@@ -4722,6 +4733,93 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+    /deep/ .icon-tree {
+        margin:0  5px 0 10px;
+        position:relative;
+        background:url('~@/assets/images/shangqi/img/tree-add.png');
+        background-size:100% 100%;
+    }
+    /deep/ .expanded{
+        background:url('~@/assets/images/shangqi/img/tree-sub.png');
+        background-size:100% 100%;
+    }
+    /deep/ .is-leaf{
+        background-image:none;
+        background-size:100% 100%;
+    }
+    /deep/ .is-leaf-none{
+        position: relative;
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background:url('~@/assets/images/shangqi/img/none-file.png');
+        background-size:100% 100%;
+    }
+    /deep/ .is-show{
+        position: relative;
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background:url('~@/assets/images/shangqi/img/tree.png');
+        background-size:100% 100%;
+    }
+    /deep/.tree-line{
+        .el-tree-node {
+            position: relative;
+            padding-left: 0px; // 缩进量
+        }
+        .el-tree-node__children {
+            padding-left: 16px; // 缩进量
+        }
+
+        // 竖线
+        .el-tree-node::before {
+            content: "";
+            height: 100%;
+            width: 1px;
+            position: absolute;
+            left: -3px;
+            top: -26px;
+            border-width: 1px;
+            border-left: 1px dashed #858990e0;
+        }
+        // 当前层最后一个节点的竖线高度固定
+        .el-tree-node:last-child::before {
+            height: 38px; // 可以自己调节到合适数值
+        }
+
+        // 横线
+        .el-tree-node::after {
+            content: "";
+            width: 11px;
+            height: 20px;
+            position: absolute;
+            left: -3px;
+            top: 12px;
+            border-width: 1px;
+            border-top: 1px dashed #858990e0;
+        }
+
+        // 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
+        & > .el-tree-node::after {
+            border-top: none;
+        }
+        & > .el-tree-node::before {
+            border-left: none;
+        }
+
+        // 展开关闭的icon
+        .el-tree-node__expand-icon{
+            font-size: 16px;
+            // 叶子节点（无子节点）
+            &.is-leaf{
+                color: transparent;
+                // display: none; // 也可以去掉
+            }
+        }
+    }
+</style>
 
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -10,7 +10,9 @@
         <el-tree
                 ref="tree"
                 node-key="id"
-                class="filter-tree"
+                class="tree-line"
+                icon-class="icon-tree"
+                :indent="0"
                 :props="props"
                 :data="treeList"
                 highlight-current
@@ -19,7 +21,7 @@
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                        <span> {{ node.label}} </span>
+                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
                         <span>
                           <el-button
                                   type="text"
@@ -184,21 +186,21 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="XCXSSRQ"
-              sortable="custom"
-              width="150px"
-              label="新车型实施日期">
+                prop="XCXSSRQ"
+                sortable="custom"
+                width="150px"
+                label="新车型实施日期">
               <template slot-scope="scope">
-                <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
+                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
-              prop="ZCCSSRQ"
-              sortable="custom"
-              width="150px"
-              label="在产车实施日期">
+                prop="ZCCSSRQ"
+                sortable="custom"
+                width="150px"
+                label="在产车实施日期">
               <template slot-scope="scope">
-                <span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
+                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -261,9 +263,73 @@
           <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
         </span>
       </el-dialog>
-      <table-tools-bar v-model="isAdvancedSearch"  @search="getDomesticStandardTableBtn(sarStandardsSearch)"
-                       @reset="clearAllSearch('sarStandardsSearch')">
-        <div slot="content">
+<!--      <table-tools-bar v-model="isAdvancedSearch"  @search="getDomesticStandardTableBtn(sarStandardsSearch)"-->
+<!--                       @reset="clearAllSearch('sarStandardsSearch')">-->
+<!--        <div slot="content">-->
+<!--          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">-->
+<!--            &lt;!&ndash;            标准号&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            标准名称&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standName')" class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            标准类别&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">-->
+<!--              <search-select-->
+<!--                v-model="sarStandardsSearch.standSort"-->
+<!--                :placeholder="$t('m.standardCategoryTips')"-->
+<!--                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"-->
+<!--                :options="standSortOptions"-->
+<!--                clearable/>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            文本状态&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            代替标准号&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            适用车型&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            适用产品线（新增字段）&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            关联模块（新增字段）&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-form>-->
+<!--        </div>-->
+<!--      </table-tools-bar>-->
+      <!--    高级筛选-->
+      <el-drawer
+          title="高级搜索"
+          size="700px"
+          :wrapperClosable="false"
+          :visible.sync="isAdvancedSearch">
+        <div class="demo-drawer-content">
           <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
             <!--            标准号-->
             <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">
@@ -275,14 +341,19 @@
               <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
+            <!--            标准英文名称-->
+            <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
+              <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
+                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+            </el-form-item>
             <!--            标准类别-->
             <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">
               <search-select
-                v-model="sarStandardsSearch.standSort"
-                :placeholder="$t('m.standardCategoryTips')"
-                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
-                :options="standSortOptions"
-                clearable/>
+                  v-model="sarStandardsSearch.standSort"
+                  :placeholder="$t('m.standardCategoryTips')"
+                  @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                  :options="standSortOptions"
+                  clearable/>
             </el-form-item>
             <!--            文本状态-->
             <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">
@@ -296,20 +367,161 @@
               <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
+            <!--            标准年份-->
+            <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
+              <el-date-picker
+                  v-model="sarStandardsSearch.standYear"
+                  type="date"
+                  placeholder="根据标准年份查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            标准发布日期-->
+            <el-form-item label="标准发布日期"  class="serch-form-item">
+              <el-date-picker
+                  v-model="sarStandardsSearch.issueTime"
+                  type="date"
+                  placeholder="根据标准发布日期查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            标准性质-->
+            <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            是否纳入标准清单-->
+            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
+              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+                <el-option value="yes" label="是"></el-option>
+                <el-option value="no" label="否"></el-option>
+              </el-select>
+            </el-form-item>
+            <!--            实施日期-->
+            <el-form-item label="实施日期">
+              <el-date-picker
+                  v-model="sarStandardsSearch.putTime"
+                  type="date"
+                  placeholder="根据实施日期查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            新车型实施日期-->
+            <el-form-item title="新车型实施日期" label="新车型实施日期">
+              <el-date-picker
+                  v-model="sarStandardsSearch.XCXTime"
+                  type="date"
+                  placeholder="根据新车型实施日期查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            在产车实施日期-->
+            <el-form-item title="在产车实施日期" label="在产车实施日期">
+              <el-date-picker
+                  v-model="sarStandardsSearch.ZCCTime"
+                  type="date"
+                  placeholder="根据在产车实施日期查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            归口管理部门-->
+            <el-form-item label="归口管理部门">
+              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            起草单位-->
+            <el-form-item label="起草单位">
+              <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            我司参与深度-->
+            <el-form-item label="我司参与深度">
+              <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+
+            <!--            能源类型-->
+            <el-form-item label="能源类型">
+              <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
             <!--            适用车型-->
             <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+              <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            适用产品线（新增字段）-->
             <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
+              <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
+            <!--            适用认证-->
+            <el-form-item label="适用认证">
+              <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            责任部门-->
+            <el-form-item label="责任部门">
+              <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            责任工程师-->
+            <el-form-item label="责任工程师">
+              <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            关联模块-VPPS编码-->
+            <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
+              <el-input v-model="sarStandardsSearch.svpps" clearable
+                        placeholder="根据关联模块-VPPS编码查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            代替标准号-->
+            <el-form-item label="代替标准号">
+              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            关联模块-中文名称-->
+            <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
+              <el-input v-model="sarStandardsSearch.standNumber" clearable
+                        placeholder="根据关联模块-中文名称"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            采标编号-->
+            <el-form-item label="采标编号" prop="nameShow">
+              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            采标程度-->
+            <el-form-item label="采标程度" prop="standNumber">
+              <el-input v-model="sarStandardsSearch.standNumber" clearable
+                        placeholder="根据采标程度查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            引用标准-->
+            <el-form-item label="引用标准">
+              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            被引用标准-->
+            <el-form-item label="被引用标准">
+              <el-input v-model="sarStandardsSearch.citedStand" clearable
+                        placeholder="根据被引用标准查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
             <!--            关联模块（新增字段）-->
             <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
               <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@@ -320,7 +532,18 @@
             </el-form-item>
           </el-form>
         </div>
-      </table-tools-bar>
+        <div class="demo-drawer-footer">
+          <el-button
+              class="common-button-primary"
+              icon="el-icon-check"
+              type="primary"
+              @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索</el-button>
+          <el-button
+              class="common-button-default"
+              icon="el-icon-close"
+              @click="clearAllSearch('sarStandardsSearch')">取消</el-button>
+        </div>
+      </el-drawer>
       <!-- 新增海外标准 -->
       <el-drawer
         :title="modalshowtitle"
@@ -2187,7 +2410,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$http.delete("sarResource/ts-resource", {
-          menuId: data.id
+          resourceId: data.id
         }, res => {
         }, e => {
           if(e.ok){
@@ -2217,10 +2440,11 @@ export default {
     },
     // 树节点鼠标移入移出
     mouseenter(data){
-      console.log(data)
-      this.$set(data, 'show', true)
-      if(data.parentId !== null){
-        this.$set(data, 'showDel', true)
+      if(data.menuName !== '我的收藏'){
+        this.$set(data, 'show', true)
+        if(data.parentId !== null){
+          this.$set(data, 'showDel', true)
+        }
       }
     },
     mouseleave(data){
@@ -2878,7 +3102,7 @@ export default {
       formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
       formData.nowOrder = this.nowOrder
       // 处理我的收藏和个性化标签传参
-      if (this.selectSarMenu.id === 'wdsc') {
+      if (this.selectSarMenu.menuName === '我的收藏') {
         formData.menuId = undefined
         formData.labelMenuId = undefined
         formData.collectMenuId = 'wdsc'
@@ -4091,6 +4315,93 @@ export default {
 }
 </script>
 
+<style lang="less" scoped>
+  /deep/ .icon-tree {
+    margin:0  5px 0 10px;
+    position:relative;
+    background:url('~@/assets/images/shangqi/img/tree-add.png');
+    background-size:100% 100%;
+  }
+  /deep/ .expanded{
+    background:url('~@/assets/images/shangqi/img/tree-sub.png');
+    background-size:100% 100%;
+  }
+  /deep/ .is-leaf{
+    background-image:none;
+    background-size:100% 100%;
+  }
+  /deep/ .is-leaf-none{
+    position: relative;
+    display: inline-block;
+    width: 15px;
+    height: 15px;
+    background:url('~@/assets/images/shangqi/img/none-file.png');
+    background-size:100% 100%;
+  }
+  /deep/ .is-show{
+    position: relative;
+    display: inline-block;
+    width: 15px;
+    height: 15px;
+    background:url('~@/assets/images/shangqi/img/tree.png');
+    background-size:100% 100%;
+  }
+  /deep/.tree-line{
+    .el-tree-node {
+      position: relative;
+      padding-left: 0px; // 缩进量
+    }
+    .el-tree-node__children {
+      padding-left: 16px; // 缩进量
+    }
+
+    // 竖线
+    .el-tree-node::before {
+      content: "";
+      height: 100%;
+      width: 1px;
+      position: absolute;
+      left: -3px;
+      top: -26px;
+      border-width: 1px;
+      border-left: 1px dashed #858990e0;
+    }
+    // 当前层最后一个节点的竖线高度固定
+    .el-tree-node:last-child::before {
+      height: 38px; // 可以自己调节到合适数值
+    }
+
+    // 横线
+    .el-tree-node::after {
+      content: "";
+      width: 11px;
+      height: 20px;
+      position: absolute;
+      left: -3px;
+      top: 12px;
+      border-width: 1px;
+      border-top: 1px dashed #858990e0;
+    }
+
+    // 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
+    & > .el-tree-node::after {
+      border-top: none;
+    }
+    & > .el-tree-node::before {
+      border-left: none;
+    }
+
+    // 展开关闭的icon
+    .el-tree-node__expand-icon{
+      font-size: 16px;
+      // 叶子节点（无子节点）
+      &.is-leaf{
+        color: transparent;
+        // display: none; // 也可以去掉
+      }
+    }
+  }
+</style>
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
@@ -4272,6 +4583,9 @@ export default {
       text-align: center;
       margin-top: 6px;
       background: #F9F9F9;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis
     }
     /deep/.el-input__inner {
       height: 30px;
@@ -4279,6 +4593,9 @@ export default {
       border-radius: 0 !important;
     }
   }
+  .el-date-editor.el-input, .el-date-editor.el-input__inner{
+    width: 190px
+  }
   .classDisplay{
     display: none;
   }

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

@@ -138,7 +138,7 @@
               ref="multipleTable"
               :data="sarProStateListDatas"
               tooltip-effect="dark"
-              style="width: 100%"
+              style="width: 100%;"
               border
               :height="sarProStateTableHeight"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -157,7 +157,7 @@
             <el-table-column
               width="150px"
               align="center"
-                prop="standNumber"
+                prop="productId"
                 label="项目编号">
             </el-table-column>
             <el-table-column
@@ -345,6 +345,7 @@ export default {
         this.querySarProStateZero()
       }, // 查看项目符合性
       querySarProStateZero () {
+        this.sarProStateTotalPage = 1
         var form = this.sarProStateEO
         // form.standId = this.standId
         form.current = this.sarProStateTotalPage
@@ -354,6 +355,13 @@ export default {
           loading: 'loading'
         }, res => {
           if (res.ok) {
+            res.data.records.forEach((item)=>{
+              for(let key  in item){
+                if(item[key] == null){
+                  item[key]='无'
+                }
+              }
+            })
             this.sarProStateListDatas = res.data.records
             this.sarProStateTotal = res.data.total
           }
@@ -385,8 +393,10 @@ export default {
   mounted () {
     this.queryStandAndLaws()
     this.tableHeight = $('.regulatory-repository').height() - 159
+    this.sarProStateTableHeight=$('.regulatory-repository').height() -120
     window.onresize = () => {
       this.tableHeight = $('.regulatory-repository').height() - 159
+      this.sarProStateTableHeight=$('.regulatory-repository').height() - 120
     }
   }
 }

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -25,33 +25,39 @@
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="historySearch.responseUnitShow" v-show="false" />
-            <el-popover
-              placement="bottom"
-              popper-class="user-dept-popper"
-              trigger="click"
-              :value="false"
-            >
-              <el-input
-                slot="reference"
-                v-model="historySearch.responseUnitShow"
-                placeholder="根据责任部门查找"
-                readonly
-                clearable
-                id="searchResp"
-              />
-              <div class="api">
-                <laws-tree
-                  :zNodes="zNodesSItem"
-                  treeDivId="zNodesSItemSearch"
-                  deptSelect
-                  showRMenu
-                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
-                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>
+            <el-select v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
+              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
+                {{ opt.label}}</el-option>
+            </el-select>
           </el-form-item>
+<!--          <el-form-item label="责任部门" class="search-item">-->
+<!--            <el-input v-model="historySearch.responseUnitShow" v-show="false" />-->
+<!--            <el-popover-->
+<!--              placement="bottom"-->
+<!--              popper-class="user-dept-popper"-->
+<!--              trigger="click"-->
+<!--              :value="false"-->
+<!--            >-->
+<!--              <el-input-->
+<!--                slot="reference"-->
+<!--                v-model="historySearch.responseUnitShow"-->
+<!--                placeholder="根据责任部门查找"-->
+<!--                readonly-->
+<!--                clearable-->
+<!--                id="searchResp"-->
+<!--              />-->
+<!--              <div class="api">-->
+<!--                <laws-tree-->
+<!--                  :zNodes="zNodesSItem"-->
+<!--                  treeDivId="zNodesSItemSearch"-->
+<!--                  deptSelect-->
+<!--                  showRMenu-->
+<!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
+<!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
+<!--                </laws-tree>-->
+<!--              </div>-->
+<!--            </el-popover>-->
+<!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
               type="primary"
@@ -374,6 +380,7 @@ export default {
       total: 0,
       // 当前页数
       pageNo: 1,
+      zrbmOptions:[],
       // 单页数量
       pageSize: this.$store.getters.userInfo.configContent,
       // 历史数据查看
@@ -652,6 +659,17 @@ export default {
     }
   },
   mounted () {
+    // 从数据库中查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.allSelectOptions = res.data || {}
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.getGzzOption()
+      this.setMap(this.standStateOptions)
+    }, e => {
+    })
     this.getTableBtn()
     this.getOrgTreeSource()
   }

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -17,33 +17,39 @@
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />
-            <el-popover
-              placement="bottom"
-              popper-class="user-dept-popper"
-              trigger="click"
-              :value="false"
-            >
-              <el-input
-                slot="reference"
-                v-model="nonConformitySearch.responsibleUnitShow"
-                placeholder="根据责任部门查找"
-                readonly
-                clearable
-                id="searchResp"
-              />
-              <div class="api">
-                <laws-tree
-                  :zNodes="zNodesSItem"
-                  treeDivId="zNodesSItemSearch"
-                  deptSelect
-                  showRMenu
-                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
-                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>
+            <el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
+              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
+                {{ opt.label}}</el-option>
+            </el-select>
           </el-form-item>
+<!--          <el-form-item label="责任部门" class="search-item">-->
+<!--            <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />-->
+<!--            <el-popover-->
+<!--              placement="bottom"-->
+<!--              popper-class="user-dept-popper"-->
+<!--              trigger="click"-->
+<!--              :value="false"-->
+<!--            >-->
+<!--              <el-input-->
+<!--                slot="reference"-->
+<!--                v-model="nonConformitySearch.responsibleUnitShow"-->
+<!--                placeholder="根据责任部门查找"-->
+<!--                readonly-->
+<!--                clearable-->
+<!--                id="searchResp"-->
+<!--              />-->
+<!--              <div class="api">-->
+<!--                <laws-tree-->
+<!--                  :zNodes="zNodesSItem"-->
+<!--                  treeDivId="zNodesSItemSearch"-->
+<!--                  deptSelect-->
+<!--                  showRMenu-->
+<!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
+<!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
+<!--                </laws-tree>-->
+<!--              </div>-->
+<!--            </el-popover>-->
+<!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
               type="primary"
@@ -427,6 +433,7 @@ export default {
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
       },
+      zrbmOptions: [], // 责任部门下拉框
       // 责任部门
       zNodesSItem: [],
       myLoading: {
@@ -654,6 +661,17 @@ export default {
     },
   },
   mounted () {
+    // 从数据库中查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.allSelectOptions = res.data || {}
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.getGzzOption()
+      this.setMap(this.standStateOptions)
+    }, e => {
+    })
     this.getTableByPage()
     // 加载所有的部门
     this.getOrgTreeSource()

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -19,16 +19,17 @@
               </p>
               <p class="transition-box-p">
                   <label class="transition-box-label">上传时间：</label>
+                  <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
+              </p>
+              <p class="transition-box-p">
+                  <label class="transition-box-label">征求意见周期：</label>
                   <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
-                  <span class="transition-box-span">-</span>
-              </p> <p class="transition-box-p">
-              <label class="transition-box-label">征求意见周期：</label>
-              <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
-          </p>
+                  <span class="transition-box-span" v-else>-</span>
+              </p>
           </div>
       </transition>
       <div class="effect">
-          <el-button type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
+          <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
           <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
       </div>
       <div class="container" style="position:relative;">
@@ -64,7 +65,7 @@
                           label="提出人"
                   >
                   </el-table-column>
-                  <el-table-column label="操作" align="center" width="50" fixed="right">
+                  <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
                       <template slot-scope="scope">
                           <div @click.stop style="display: inline-block">
                               <el-dropdown trigger="click" @command="handleCommand">
@@ -96,11 +97,11 @@
         >
             <div class="demo-drawer-content add-demo">
                 <div class="search-area">
-                    <el-form :model="opinionContent"  class="label-input-form">
-                        <el-form-item label="章节编号" label-width="80px"  class="add-form-item">
+                    <el-form :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
+                        <el-form-item label="章节编号" label-width="80px" prop="partCode" class="add-form-item">
                             <el-input  v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
                         </el-form-item>
-                        <el-form-item label="修改意见内容(包括理由或依据)" label-width=""  class="add-form-item">
+                        <el-form-item label="修改意见内容(包括理由或依据)" prop="content" label-width="" class="add-form-item">
                             <el-input :autosize="{ minRows: 2, maxRows: 8}" type="textarea" v-model="opinionContent.content" autocomplete="off" placeholder="请输入修改意见内容"></el-input>
                         </el-form-item>
                     </el-form>
@@ -132,13 +133,23 @@ export default {
             partCode: '',
             content: '',
         },
+        opinionContentRules: {
+            partCode: [
+                { required: true, message: '请输入章节编号', trigger: 'blur' },
+            ],
+            content: [
+                { required: true, message: '请输入修改意见内容(包括理由或依据)', trigger: 'blur' }
+            ],
+        },
         standinfoList: [], // 详情列表
         form: {
             cid: this.$route.query.item.cid,
             page: 1,
             size: this.$store.getters.userInfo.configContent,
             userId: this.$store.getters.userInfo.userId,
-        } // 详情数据
+            endTime:  this.$route.query.item.endTime
+        }, // 详情数据
+        ideaKey: false
     }
   },
   methods: {
@@ -154,6 +165,13 @@ export default {
               this.standinfoList = res.data.records
               this.total = res.data.total
               this.spinShow = false
+              res.data.records.forEach(item => {
+                  if (item.ideaKey == 1) {
+                      this.ideaKey = false
+                  } else {
+                      this.ideaKey = true
+                  }
+              })
           }, e => {
           })
       },
@@ -228,32 +246,36 @@ export default {
       },
       //点击抽屉按钮提交事件
       saveUserInfo() {
-          var url = ''
-          var form = {
-              cid: this.$route.query.item.cid,
-              content: this.opinionContent.content,
-              partCode: this.opinionContent.partCode,
-              userId: this.$store.getters.userInfo.userId,
-              userName: this.$store.getters.userInfo.account,
-              deptName: this.$store.getters.userInfo.orgName,
-              deptId: this.$store.getters.userInfo.orgId
-          }
-          if (this.type === 'edit') {
-              form.id = this.id
-              form.autUserId = this.$store.getters.userInfo.userId
-              url = 'slrs/sar-public-idea-all/updateStand'
-          } else {
-              url = 'slrs/sar-public-idea-all/insetStand'
-          }
-          this.$http.post(url, form, {
-              _this: this
-          }, res => {
-              if (res.respCode === '200') {
-                  this.form.page = 1
-                  this.getList()
-              }
+          this.$refs['formAdd'].validate((valid) => {
+                  if (valid) {
+                      var url = ''
+                      var form = {
+                          cid: this.$route.query.item.cid,
+                          content: this.opinionContent.content,
+                          partCode: this.opinionContent.partCode,
+                          userId: this.$store.getters.userInfo.userId,
+                          userName: this.$store.getters.userInfo.account,
+                          deptName: this.$store.getters.userInfo.orgName,
+                          deptId: this.$store.getters.userInfo.orgId
+                      }
+                      if (this.type === 'edit') {
+                          form.id = this.id
+                          form.autUserId = this.$store.getters.userInfo.userId
+                          url = 'slrs/sar-public-idea-all/updateStand'
+                      } else {
+                          url = 'slrs/sar-public-idea-all/insetStand'
+                      }
+                      this.$http.post(url, form, {
+                          _this: this
+                      }, res => {
+                          if (res.respCode === '200') {
+                              this.form.page = 1
+                              this.getList()
+                          }
+                      })
+                      this.isDialog = false
+                  }
           })
-          this.isDialog = false
       },
       //点击抽屉按钮取消事件
       closeDrawer() {

src/router/index.js

@@ -591,6 +591,15 @@ const routes = [
           title: '标准征求意见流程'
         }
       },
+      {
+        path: '/bzzqyjStep1-1',
+        name: 'bzzqyjStep1-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准征求意见流程'
+        }
+      },
       {
         path: '/bzzqyjStep2',
         name: 'bzzqyjStep2',

src/sysConfig/index.js

@@ -4,12 +4,9 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-// const devIp = '39.98.140.126'
-// const devInterfacePORT = '10005'
-// const devIp = '192.168.10.248'
-// const devIp = '101.36.227.25'
-// const devInterfacePORT = '8038'
-const devIp = '10.96.170.156'
+// const devIp = '10.96.10.171'
+// const devInterfacePORT = '9999'
+const devIp = '192.168.1.145'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'