Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON 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/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

src/pages/details/otherStandardDetails/index.vue

@@ -1267,6 +1267,9 @@ export default {
   },
   watch: {},
   methods: {
+    FormatDate(date){
+        return moment(date).format('YYYY-MM-DD');
+    },
     // 将文本状态的id与name对应
     setMap(data){
       data.forEach(item => {
@@ -2703,8 +2706,8 @@ export default {
         location.half = half
         location.showAll = false
       })
-      this.$http.get('sarSarAccessInfo/sar-sar-access-info/selectProTimeInfoByStandId', {
+      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
-        standId: this.$route.params.id
+        id: this.$route.params.id
       }, {
         _this: this
       }, res => {
@@ -2721,7 +2724,6 @@ export default {
           }
         })
         this.dynamicFormField = displayLocation
-        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"

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

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

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"

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,10 +543,12 @@
                                             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>
@@ -727,6 +733,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-->
@@ -1235,6 +1248,7 @@
                 url:'',
                 urlChild:'',
                 drawerTitle: '', //drawer标题
+                showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
                 defaultCheckedKeys: [],
                 nodeKeyCode: 'code',
@@ -1834,12 +1848,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()

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-row :gutter="24">
-                            <el-col :span="12">
+                        <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                          <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 }}
+                              {{ form.xgdName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                        - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                          <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 }}
+                              {{ form.fbgbjbdName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                      - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                          <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 }}
+                              {{ form.zbjbdName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                       - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                          <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 }}
+                              {{ form.bpgName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                       - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                          <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 }}
+                              {{ form.ssgName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                      - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                            </el-col>
+                        </el-col>
-                            <el-col :span="12">
+                        <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                          <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 }}
+                              {{ form.kwjName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                      - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                          <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 }}
+                              {{ form.zqyjgName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                      - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                          <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 }}
+                              {{ form.caName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                       - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                          <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 }}
+                              {{ form.jdwjName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                       - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                            </el-col>
+                        </el-col>
-                        </el-row>
+                      </el-row>
                     </div>
                     <ProcessTitle>
                         <template slot="title">适用范围</template>
@@ -467,14 +467,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
+                              <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 }}
+                                  {{ form.glwjName }}
-                                    </div>
+                                </div>
-                                    <div v-else>
+                                <div v-else>
-                                       - -
+                                  - -
-                                    </div>
+                                </div>
-                                </el-form-item>
+                              </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -685,6 +685,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' }]
@@ -844,6 +854,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 +943,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 => {

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>
@@ -461,7 +461,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 +666,16 @@ export default {
   name: "bzrkStep3",
   data () {
     return {
+      xgdFileId: '',
+      fbgbjbdFileId: '',
+      bpgFileId: '',
+      ssgFileId: '',
+      zqyjgFileId: '',
+      jdwjFileId: '',
+      kwjFileId: '',
+      glwjFileId: '',
+      caFileId: '',
+      zbjbdFileId:'',
       activeName:'1',
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -818,6 +828,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 +912,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 => {

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

@@ -718,6 +718,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 +737,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">
@@ -1398,12 +1405,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(',')
+        this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
-      }else {
+      }else if(this.replaceLawType === 'cbbh'){
-        this.form.byybj = textArr.join(',')
+        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 +1615,7 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
+            this.commentText = processForm.commentText
             this.getFormFieldList(processForm)
           }
         }).catch(e => {

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

@@ -198,84 +198,84 @@
                         <template slot="title">文本信息</template>
                     </ProcessTitle>
                     <div class="prc-content-border">
-                        <el-row :gutter="24">
+                      <el-row :gutter="24">
-                            <el-col :span="12">
+                        <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
+                          <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.xgd">
+                            <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
-                                        {{ form.xgd }}
+                              {{ form.xgdName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                        - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
+                          <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.fbgbjbd">
+                            <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
-                                        {{ form.fbgbjbd }}
+                              {{ form.fbgbjbdName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                      - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
+                          <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zbjbd">
+                            <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
-                                        {{ form.zbjbd }}
+                              {{ form.zbjbdName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                       - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
+                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.bpg">
+                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
-                                        {{ form.bpg }}
+                              {{ form.bpgName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                       - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
+                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ssg">
+                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
-                                        {{ form.ssg }}
+                              {{ form.ssgName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                      - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                            </el-col>
+                        </el-col>
-                            <el-col :span="12">
+                        <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
+                          <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.kwj">
+                            <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
-                                        {{ form.kwj }}
+                              {{ form.kwjName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                      - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
+                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zqyjg">
+                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
-                                        {{ form.zqyjg }}
+                              {{ form.zqyjgName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                      - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
+                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ca">
+                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                                        {{ form.ca }}
+                              {{ form.caName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                       - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
+                          <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.jdwj">
+                            <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
-                                        {{ form.jdwj }}
+                              {{ form.jdwjName }}
-                                    </div>
+                            </div>
-                                    <div v-else>
+                            <div v-else>
-                                       - -
+                              - -
-                                    </div>
+                            </div>
-                                </el-form-item>
+                          </el-form-item>
-                            </el-col>
+                        </el-col>
-                        </el-row>
+                      </el-row>
                     </div>
                     <ProcessTitle>
                         <template slot="title">适用范围</template>
@@ -465,14 +465,15 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
+                              <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.glwj">
+                                <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
-                                        {{ form.glwj }}
+                                  {{ form.glwjName }}
-                                    </div>
+                                </div>
-                                    <div v-else>
+                                <div v-else>
-                                       - -
+                                  - -
-                                    </div>
+                                </div>
-                                </el-form-item>
+                              </el-form-item>
+
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -670,6 +671,16 @@
         name: "bzrkStep5",
         data () {
             return {
+              xgdFileId: '',
+              fbgbjbdFileId: '',
+              bpgFileId: '',
+              ssgFileId: '',
+              zqyjgFileId: '',
+              jdwjFileId: '',
+              kwjFileId: '',
+              glwjFileId: '',
+              caFileId: '',
+              zbjbdFileId:'',
               // 当前流程类型(1待办/2已办)
               processType: 1,
                 detailData: [],
@@ -790,6 +801,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 +850,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 => {

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/xmpg2/step5.vue

@@ -304,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", {
@@ -321,10 +319,6 @@ export default {
             }
           }, e => {
           });
-        } else {
-          this.$message.warning("请选择分发负责人");
-        }
-      });
     },
     //批量分发按钮
     batchOperation(id) {

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

@@ -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/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  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="文本状态"  v-show="!isListType">
+          <el-form-item label="标准号" class="labelBox">
-            <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-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"
+              clearable/>
-              placeholder="选择更新日期">
+          </el-form-item>
-            </el-date-picker>
+          <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">
+            <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
-<!--              <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
-            </el-input>
           </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: '',
+        askType: '', // 监管类型
-        // applicationScope: '', //适用区域
+        dataSource: 'INLAND_STAND', // 数据来源
-        keywords: '', // 关键字
+        page: 1,
-        detailedListName: '', //清单名称
+        pageSize: this.$store.getters.userInfo.configContent,
-        applyArctic: '', // 能源种类
+        validFlag: 0,
+        advanceSearchVOStr: ''
+      },
+      sarAccessInfo: {
+        id: '',
+        standNumber: '',
+        standName: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -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.sarAccessInfo.standName = ''
-      this.sarAccessInfoSearch.textStatus = ''
+      this.sarAccessInfo.standNumber = ''
       this.isListType = false
       this.selectLawsStands()
     },
@@ -1474,6 +1361,11 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1482,8 +1374,35 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          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 => {
+      })
+    },
+    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
+          }
           this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
           this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
@@ -2169,6 +2088,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,
+          id: data.id,
-          sarType: row.sarState
+          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  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="文本状态"  v-show="!isListType">
+          <el-form-item label="标准号" class="labelBox">
-            <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-input
-              size="small"
+              v-model="sarAccessInfo.standNumber"
-              v-model="sarAccessInfoSearch.standSystem"
               placeholder="请输入"
-              :maxlength="100"
+              size="small"
-            ></el-input>
+              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"
+              clearable/>
-              placeholder="选择更新日期">
+          </el-form-item>
-            </el-date-picker>
+          <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
@@ -525,7 +420,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: {
@@ -607,18 +502,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: '', // 国家
+        standName: '',
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -626,6 +517,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 +757,9 @@ export default {
   methods: {
     // 高级检索
     selectMoreBtn () {
+      this.showSelectBox = !this.showSelectBox
+      this.showTableFlag = false
+      this.selectLawsStands()
     },
     // 法规维护人树
     getDept () {
@@ -945,11 +850,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()
@@ -1278,9 +1182,42 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        _this: this
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
-      }, res =>{
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
+      StandardsInfoPage(this.sarAccessInfoSearch).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
+          }
+          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 => {
+      })
+    },
+    // 高级检索查询按钮
+    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) {
@@ -1288,8 +1225,6 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-        })
-        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)
@@ -1303,7 +1238,6 @@ export default {
         })
         this.drawerTotal = res.data.list.length
       }, e => {
-
       })
     },
     // 数据搜索table判断checked状态
@@ -1987,6 +1921,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  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="文本状态"  v-show="!isListType">
+          <el-form-item label="标准号" class="labelBox">
-            <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-input
-              size="small"
+              v-model="sarAccessInfo.standNumber"
-              v-model="sarAccessInfoSearch.standSystem"
               placeholder="请输入"
-              :maxlength="100"
+              size="small"
-            ></el-input>
+              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"
+              clearable/>
-              placeholder="选择更新日期">
+          </el-form-item>
-            </el-date-picker>
+          <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>
@@ -519,7 +420,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: {
@@ -601,18 +502,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: '', // 国家
+        standName: '',
-        // applicationScope: '', //适用区域
+        askType: '', // 监管类型
-        keywords: '', // 关键字
+        dataSource: 'INLAND_STAND', // 数据来源
-        detailedListName: '', //清单名称
+        page: 1,
-        applyArctic: '', // 能源种类
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: ''
+      },
+      sarAccessInfo: {
+        id: '',
+        standName: '',
+        standNumber: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -943,11 +851,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()
@@ -1276,9 +1183,12 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        _this: this
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
-      }, res =>{
+      } 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 +1196,49 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          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 => {
+      })
+    },
+    /** 高级查询查询按钮*/
+    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
+          }
+          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状态
@@ -1987,6 +1936,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

@@ -188,22 +188,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
@@ -2516,7 +2515,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 +2677,11 @@ export default {
       },
       // 树节点鼠标移入移出
       mouseenter(data){
-          console.log(data)
+          if(data.menuName !== '我的收藏'){
-          this.$set(data, 'show', true)
+              this.$set(data, 'show', true)
-          if(data.parentId !== null){
+              if(data.parentId !== null){
-              this.$set(data, 'showDel', true)
+                  this.$set(data, 'showDel', true)
+              }
           }
       },
       mouseleave(data){
@@ -2690,6 +2689,7 @@ export default {
           this.$set(data, 'showDel', false)
       },
     treeClick (treeNode) {
+        console.log(treeNode)
       this.selectSarMenu = treeNode
       this.standCommonlySearch.menuId = treeNode.id
       this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
@@ -3431,8 +3431,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 +3473,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)

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -184,21 +184,21 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="XCXSSRQ"
+                prop="XCXSSRQ"
-              sortable="custom"
+                sortable="custom"
-              width="150px"
+                width="150px"
-              label="新车型实施日期">
+                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"
+                sortable="custom"
-              width="150px"
+                width="150px"
-              label="在产车实施日期">
+                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
@@ -2187,7 +2187,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 +2217,11 @@ export default {
     },
     // 树节点鼠标移入移出
     mouseenter(data){
-      console.log(data)
+      if(data.menuName !== '我的收藏'){
-      this.$set(data, 'show', true)
+        this.$set(data, 'show', true)
-      if(data.parentId !== null){
+        if(data.parentId !== null){
-        this.$set(data, 'showDel', true)
+          this.$set(data, 'showDel', true)
+        }
       }
     },
     mouseleave(data){
@@ -2878,7 +2879,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'

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

@@ -96,11 +96,11 @@
         >
             <div class="demo-drawer-content add-demo">
                 <div class="search-area">
-                    <el-form :model="opinionContent"  class="label-input-form">
+                    <el-form :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
-                        <el-form-item label="章节编号" label-width="80px"  class="add-form-item">
+                        <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,6 +132,14 @@ 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,
@@ -228,32 +236,36 @@ export default {
       },
       //点击抽屉按钮提交事件
       saveUserInfo() {
-          var url = ''
+          this.$refs['formAdd'].validate((valid) => {
-          var form = {
+                  if (valid) {
-              cid: this.$route.query.item.cid,
+                      var url = ''
-              content: this.opinionContent.content,
+                      var form = {
-              partCode: this.opinionContent.partCode,
+                          cid: this.$route.query.item.cid,
-              userId: this.$store.getters.userInfo.userId,
+                          content: this.opinionContent.content,
-              userName: this.$store.getters.userInfo.account,
+                          partCode: this.opinionContent.partCode,
-              deptName: this.$store.getters.userInfo.orgName,
+                          userId: this.$store.getters.userInfo.userId,
-              deptId: this.$store.getters.userInfo.orgId
+                          userName: this.$store.getters.userInfo.account,
-          }
+                          deptName: this.$store.getters.userInfo.orgName,
-          if (this.type === 'edit') {
+                          deptId: this.$store.getters.userInfo.orgId
-              form.id = this.id
+                      }
-              form.autUserId = this.$store.getters.userInfo.userId
+                      if (this.type === 'edit') {
-              url = 'slrs/sar-public-idea-all/updateStand'
+                          form.id = this.id
-          } else {
+                          form.autUserId = this.$store.getters.userInfo.userId
-              url = 'slrs/sar-public-idea-all/insetStand'
+                          url = 'slrs/sar-public-idea-all/updateStand'
-          }
+                      } else {
-          this.$http.post(url, form, {
+                          url = 'slrs/sar-public-idea-all/insetStand'
-              _this: this
+                      }
-          }, res => {
+                      this.$http.post(url, form, {
-              if (res.respCode === '200') {
+                          _this: this
-                  this.form.page = 1
+                      }, res => {
-                  this.getList()
+                          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',