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

src/pages/localTool/standardRecognition/index.vue

@@ -216,7 +216,7 @@
           :loading="isSubmit"
           >{{ btnName }}</el-button
         >
-        <!--          <el-button  @click="uploadSave" type="primary">转换</Button>-->
+        <!--<el-button  @click="uploadSave" type="primary">转换</Button>-->
       </div>
     </el-dialog>
   </div>

src/pages/processCenter/pages/components/ProcessFooter.vue

@@ -53,7 +53,7 @@
         size="small"
         class="common-button-danger"
         @click="beforeBack"
-        :loading="isSubmit"
+        :loading="isSubmitBack"
         v-if="showBack">
         <i class="iconfont" style="font-size: 12px;">&#xe615;</i>
         {{ backBTNText }}</el-button>
@@ -151,6 +151,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 保存按钮loading
+    isSubmitBack: {
+      type: Boolean,
+      default: false
+    },
     // 是否默认委托事件
     defaultEntrust: {
       type: Boolean,

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

@@ -45,18 +45,23 @@
                           v-model="form.modelName"
                           clearable
                   ></el-input>
-                  <div v-if="form.modelName" @click="fileUpload" class="fileClass">
+<!--                  <div v-if="form.modelName" @click="fileUpload" class="fileClass">-->
-                    {{ form.modelName }}
+<!--                    {{ form.modelName }}-->
-                  </div>
+<!--                  </div>-->
-                  <div v-else>
+<!--                  <div v-else>-->
-                    <el-button
+<!--                    <el-button-->
-                            type="primary"
+<!--                            type="primary"-->
-                            class="common-button-primary"
+<!--                            class="common-button-primary"-->
-                            @click="fileUpload"
+<!--                            @click="fileUpload"-->
-                            size="mini">
+<!--                            size="mini">-->
-                      点击上传
+<!--                      点击上传-->
+<!--                    </el-button>-->
+
+                    <el-button type="primary" @click="fileUpload">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      {{isFileUploadStr}}
                     </el-button>
-                  </div>
+<!--                  </div>-->
                 </el-form-item>
               </el-col>
             </el-row>
@@ -179,7 +184,7 @@
               :before-upload="beginImportFile"
               :on-success="importFileSuccess"
               :on-progress="progressFile"
-              :show-file-list="false"
+              :show-file-list="true"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -201,6 +206,7 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      isFileUploadStr:'点击上传',
       progressType: false,
       loadProgress: 0,
       commentText: '',
@@ -350,7 +356,8 @@ export default {
     // 导入标准数据成功后执行
     importFileSuccess (response, file) {
       if (response.ok) {
-        this.fileMadel = false
+        this.isFileUploadStr='点击查看已上传文件';
+        this.fileMadel = true;
         this.loadProgress = 0
         this.progressType = false
         this.form.model = response.data.id

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

@@ -155,6 +155,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -735,6 +750,7 @@ export default {
         pageSizeNo: this.$store.getters.userInfo.configContent
       },
       standList: [], //新添加的标准
+      commentText: '',
       modalshowflag: false, // drawer开关
       modalshowflag2: false,
       nodeList2: [],
@@ -1052,6 +1068,7 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
+        this.listForm.commentText = this.commentText
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {

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

@@ -134,6 +134,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
@@ -421,6 +436,7 @@ export default {
       totalNo: 0,
       prcNum: '',
       pageSizeNo: this.$store.getters.userInfo.configContent,
+      commentText:'',
       listForm: {
         listName: "", //清单名称
         // applyRegion: "", //适用区域
@@ -677,6 +693,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.listForm.commentText = this.commentText
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,

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

@@ -384,14 +384,15 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.approvalOpinion = "1";
-      this.handleSubmit();
-    },
-    //提交事件
-    handleSubmit() {
       if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
         this.$message.warning("请填写审批意见");
       } else {
+        this.listForm.approvalOpinion = "1";
+        this.handleSubmit();
+      }
+    },
+    //提交事件
+    handleSubmit() {
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -408,7 +409,6 @@ export default {
           }
           this.isSubmit = false
         });
-      }
     },
     //选择标准取消事件
     closeDrawer() {

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

@@ -158,6 +158,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -712,6 +727,7 @@ export default {
         pageSizeNo: this.$store.getters.userInfo.configContent
       },
       standList: [], //新添加的标准
+      commentText: '',
       modalshowflag: false, // drawer开关
       modalshowflag2: false,
       nodeList2: [],
@@ -1024,6 +1040,7 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
+        this.listForm.commentText = this.commentText
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {

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

@@ -387,9 +387,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning("请填写会签意见");
-      }else{
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         this.listForm.approvalOpinion = "";
@@ -410,7 +407,6 @@ export default {
         }, e => {
 
         });
-      }
     },
     //选择标准取消事件
     closeDrawer() {

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

@@ -149,6 +149,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
@@ -392,6 +407,7 @@ export default {
       // 当前流程类型(1待办/2已办)
       processType: 1,
       searching: false,
+      commentText:'',
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -711,6 +727,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.listForm.commentText = this.commentText
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {

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

@@ -401,9 +401,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning("请填写审批意见");
-      } else {
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -420,7 +417,6 @@ export default {
           }
           this.isSubmit = false
         });
-      }
     },
     //选择标准取消事件
     closeDrawer() {

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

@@ -862,8 +862,13 @@
       },
         methods: {
           downloadFile (fileType) {
+            //文件id中出现了','字符,去除掉
             if(fileType === 'fbgbjbd'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+              if(this.fbgbjbdFileId.search(',')){
+                this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+                console.log(this.fbgbjbdFileId);
+              }
+               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'){
@@ -885,11 +890,12 @@
             }
           },
           getRule(){
+
             if (this.formTongGuo.approvalOpinion === '0') {
-              this.rules.commentText.required = false
+              this.rules.commentText[0].required = false;
               this.$refs.formTongGuo.clearValidate('commentText')
-            } else {
+            }else {
-              this.rules.commentText.required = true
+              this.rules.commentText[0].required = true;
             }
           },
             popoverHide (checkedIds, checkedData) {
@@ -964,6 +970,7 @@
                           this.caFileId = processForm.ca
                           this.zbjbdFileId = processForm.zbjbd
                           this.getFormFieldList(processForm)
+                          console.log(processForm);
                         }
                     }).catch(e => {
                     })

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

@@ -836,6 +836,10 @@ export default {
   methods: {
     downloadFile (fileType) {
       if(fileType === 'fbgbjbd'){
+        if(this.fbgbjbdFileId.search(',')){
+          this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+          console.log(this.fbgbjbdFileId);
+        }
         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
       }else if(fileType === 'xgd'){
         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId

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

@@ -815,6 +815,10 @@
         methods: {
           downloadFile (fileType) {
             if(fileType === 'fbgbjbd'){
+              if(this.fbgbjbdFileId.search(',')){
+                this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+                console.log(this.fbgbjbdFileId);
+              }
               window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
             }else if(fileType === 'xgd'){
               window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId

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

@@ -31,7 +31,7 @@
             <el-table-column type="selection" width="55" align="center"/>
             <el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
               <template slot-scope="scope">
-                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
               </template>
             </el-table-column>
             <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -102,7 +102,7 @@
                   <h4>确认+选择责任人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
+                    <el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -114,7 +114,7 @@
                   <h4>负责人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="选择负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
+                    <el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="负责人">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -126,7 +126,7 @@
                   <h4>分发负责人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.checkUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
+                    <el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -148,7 +148,7 @@
           <el-form :modal="queryUnqualidiedData" inline class="label-input-form">
             <el-form-item label="标准号/标准名称" class="search-item">
               <el-input
-                v-model="queryUnqualidiedData.standSerialNumber"
+                v-model="queryUnqualidiedData.standId"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
@@ -210,9 +210,9 @@
           @selection-change="selectedChange"
         >
         <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
+        <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
           <template slot-scope="scope">
-            <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+            <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
           </template>
         </el-table-column>
         <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -291,6 +291,7 @@ export default {
         pageSize: 10,
         total: 0,
         closeState: '1',
+        standId: '',
         standSerialNumber: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门

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

@@ -97,9 +97,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
+          <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">

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

@@ -99,9 +99,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
+          <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">

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

@@ -87,9 +87,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
+          <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -118,6 +118,7 @@
                   accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                   :before-upload="handleBeforeUpload"
                   :before-remove="handleBeforeRemove"
+                  :on-remove="handleONRemove"
                   :on-success="handleOnsuccess"
                 >
                 <el-button
@@ -314,12 +315,7 @@ export default {
         }
         this.dataList.forEach(item => {
           if (item.fileText.length !== 0) {
-            item.fileText.forEach(item1 => {
+            this.fileTextList = item.fileText
-              this.fileTextList.push({
-                id: item1.id,
-                name: item1.name
-              })
-            })
           }
         })
       })
@@ -335,10 +331,18 @@ export default {
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {
-        this.newDataList.push({
+        if (this.fileTextList !== null) {
-          id: res.data.attId,
+          this.newDataList = this.fileTextList
-          name: res.data.standName
+          this.newDataList.push({
-        })
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        } else {
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        }
         this.fileListData.fileText = this.newDataList
         this.$message({
           showClose: true,
@@ -377,14 +381,17 @@ export default {
     },
     // 移除上传的文件
     handleBeforeRemove(file, fileList) {
+      this.fileListData.fileText = fileList
       this.fileTextList = fileList
-      this.newDataList.forEach((item, index) => {
+/*      this.newDataList.forEach((item, index) => {
         if (file.name === item.name || file.id === item.id) {
           this.newDataList.splice(index, 1)
-        }
+          console.log(this.dataList)
-      })
-    },
 
+        }
+      })*/
+    },
+    handleONRemove() {},
     /************ ********* *****************/
     // 点击查看
     handlePreview (item) {

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

@@ -87,9 +87,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
+          <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -201,7 +201,7 @@
       approval
       @back="handleSubmitNo"
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
+      :isSubmitBack="backLoading"
       @submit="handleSubmit"
       submitBTNText="同意"
     >
@@ -357,6 +357,7 @@ export default {
       })
     },
     handleSubmitNo() {
+      this.backLoading = true
       if (this.commentText) {
         var json = {
           responUserInfo: {
@@ -372,12 +373,13 @@ export default {
         }, {}, res => {
           if (res.success) {
             this.$message.success('驳回成功')
-            this.fileTextList = []
             this.$router.push('/processCenter')
+            this.backLoading = false
           }
         })
       } else {
         this.$message.warning('请输入反馈意见')
+        this.backLoading = false
       }
     },
     //未整改项抽屉中的查询按钮

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

@@ -114,6 +114,21 @@
         </el-table>
       </div>
     </div>
+    <div>
+      <el-collapse accordion>
+        <el-collapse-item title="意见填写">
+          <div style="margin: 10px 0;">
+            <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
@@ -390,6 +405,7 @@ export default {
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
+      commentText:'',
       standardSearch: {
         standType: "",
         standName: ""

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

@@ -101,6 +101,21 @@
         </el-table>
       </div>
     </div>
+    <div>
+      <el-collapse accordion>
+        <el-collapse-item title="意见填写">
+          <div style="margin: 10px 0;">
+            <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
@@ -374,6 +389,7 @@ export default {
       productData: [], //添加抽屉的数据
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
+      commentText: '',
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
@@ -658,6 +674,7 @@ export default {
           this.$message.warning("请选择分发责任人");
         } else {
           this.isSubmit = true
+          this.listForm.commentText = this.commentText;
           var json = Object.assign(this.listForm, this.roleForm);
           this.$refs["listForm"].validate((valid) => {
             if (valid) {

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

@@ -336,9 +336,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.commentText = this.commentText
         const json = JSON.stringify(this.listForm);
         this.isSubmit = true
@@ -356,7 +353,7 @@ export default {
           this.isSubmit = false
         }, e => {
         });
-      }
+
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -464,4 +461,3 @@ export default {
   }
 }
 </style>
-

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

@@ -126,6 +126,7 @@
             </template>
           </el-table-column>
         </el-table>
+
         <!--    选择责任人-->
         <Role-tree
           check-box

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

@@ -246,21 +246,21 @@
           </el-table-column>
         </el-table>
       </div>
-<!--      <div>-->
+      <div>
-<!--        <el-collapse accordion>-->
+        <el-collapse accordion>
-<!--          <el-collapse-item title="填写评估反馈">-->
+          <el-collapse-item title="意见填写">
-<!--            <div style="margin: 10px 0;">-->
+            <div style="margin: 10px 0;">
-<!--              <el-input-->
+              <el-input
-<!--                type="textarea"-->
+                type="textarea"
-<!--                :rows="3"-->
+                :rows="3"
-<!--                resize="none"-->
+                resize="none"
-<!--                placeholder="请输入您的评估分析"-->
+                placeholder="请输入意见"
-<!--                v-model="commentText">-->
+                v-model="commentText">
-<!--              </el-input>-->
+              </el-input>
-<!--            </div>-->
+            </div>
-<!--          </el-collapse-item>-->
+          </el-collapse-item>
-<!--        </el-collapse>-->
+        </el-collapse>
-<!--      </div>-->
+      </div>
     </div>
 
     <div class="content" v-show="active === '3'">
@@ -616,5 +616,3 @@ export default {
   }
 }
 </style>
-
-

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

@@ -447,9 +447,6 @@ export default {
     },
     //驳回事件
     beforeBack () {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
         this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
         this.listForm.commentText = this.commentText;
         this.listForm.dataList = this.dataList
@@ -468,17 +465,13 @@ export default {
           }
         }, e => {
         });
-      }
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else {
         this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
-        this.listForm.commentText = this.commentText;
         this.listForm.dataList = this.dataList
         this.listForm.fenFlag = '2'
+       this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.isSubmit = true
         this.$http.post('lawss/activiti/completeTask', {
@@ -495,7 +488,7 @@ export default {
           this.isSubmit = false
         }, e => {
         });
-      }
+
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -602,6 +595,4 @@ export default {
     margin-top: 10px;
   }
 }
-</style>
+</style>>
-
-

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

@@ -452,9 +452,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
         this.isSubmit = true
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
@@ -480,7 +477,7 @@ export default {
         }, e => {
 
         });
-      }
+
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -588,5 +585,3 @@ export default {
   }
 }
 </style>
-
-

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

@@ -451,9 +451,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
         this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -479,7 +476,6 @@ export default {
         }, e => {
 
         });
-      }
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -514,7 +510,6 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
-
 .xmpg-step7 {
   /deep/ .el-drawer__container {
     .prc-content-border {

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

@@ -87,22 +87,22 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="190px"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             align="center"
             sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -140,6 +140,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -337,6 +352,7 @@ export default {
       active: "1",  //当前选中的type
       isSubmit: false,
       saveLoading: false,
+      commentText: '',
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
@@ -406,7 +422,6 @@ export default {
       queryTaskFirst({
         bpnId: this.$route.query.bpnId
       }).then(res => {
-        console.log(res.mes);
         let mes = JSON.parse(res.mes);
         this.listForm = mes.form;
         this.dataList = mes.form.dataList;
@@ -522,6 +537,7 @@ export default {
     },
     //流程提交事件
     handleSubmit(){
+      this.listForm.commentText = this.commentText;
       var json = Object.assign(this.listForm, this.roleForm)
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.uName;
@@ -530,6 +546,7 @@ export default {
         if (valid) {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
+              this.isSubmit = true
               this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
                 _this: this
               }, res => {
@@ -545,6 +562,7 @@ export default {
                       this.$message.success(res.message);
                       this.$router.push("/processCenter");
                     }
+                    this.isSubmit = false
                   });
                 }
               });

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

@@ -140,6 +140,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -340,7 +355,7 @@ export default {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
-        breakdownList: [], //标准下的分解单数据
+        breakdownList: [] //标准下的分解单数据
       },
       dataList: [], //下面标准的数据
       breakdownList: [], //标准下的条款数据
@@ -379,6 +394,7 @@ export default {
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
       nodeList: [],
+      commentText: "",
       projectModel: false,  //项目抽屉开关
       projectId: "", //项目id 用来查询标准
       standId: [], //标准id 用来条款
@@ -457,17 +473,17 @@ export default {
         this.listForm.dataList.forEach(item => {
           // 责任部门转换
           if (item.zrbm !== null || item.zrbm !== "") {
-            let k = (item.zrbm || "").split(',')
+            let k = (item.zrbm || "").split(",");
             for (let i in this.zrbmOptions) {
-              for (let m = 0; m< k.length; m++) {
+              for (let m = 0; m < k.length; m++) {
                 if (this.zrbmOptions[i].value === k[m]) {
-                  k[m]  = this.zrbmOptions[i].label
+                  k[m] = this.zrbmOptions[i].label;
                 }
-                item.zrbm = k.join(',')
+                item.zrbm = k.join(",");
               }
             }
           }
-        })
+        });
         let ids = [];
         this.dataList.forEach(item => {
           ids.push(item.standId);
@@ -485,7 +501,7 @@ export default {
         {
           _this: this
         }, res => {
-          this.listForm.breakdownList = res.data
+          this.listForm.breakdownList = res.data;
         });
     },
     //标准的多选框改变
@@ -502,64 +518,65 @@ export default {
 
     },
     //流程保存事件
-    handleSave(){
+    handleSave() {
-      this.saveLoading = true
+      this.saveLoading = true;
-      let _formData = new FormData()
+      let _formData = new FormData();
-      _formData.append('id', this.bpnId || '')
+      _formData.append("id", this.bpnId || "");
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append("createUserName", this.$store.getters.userInfo.userName);
-      _formData.append('prcType', '6')
+      _formData.append("prcType", "6");
-      _formData.append('json', JSON.stringify({
+      _formData.append("json", JSON.stringify({
-        form: this.form,
+        form: this.listForm,
         roleForm: this.roleForm,
         commentText: this.commentText
-      }))
+      }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
+        this.saveLoading = false;
-        this.$message.success('保存成功')
+        this.$message.success("保存成功");
-        this.bpnId = res.result
+        this.bpnId = res.result;
       }).catch(e => {
-        this.saveLoading = false
+        this.saveLoading = false;
-      })
+      });
     },
     //流程提交事件
-    handleSubmit(){
+    handleSubmit() {
-          var json = Object.assign(this.listForm, this.roleForm)
+      this.listForm.commentText = this.commentText;
-          json.prcCreateUser = this.$store.getters.userInfo.userId;
+      var json = Object.assign(this.listForm, this.roleForm);
-          json.prcCreateUserName = this.$store.getters.userInfo.uName;
+      json.prcCreateUser = this.$store.getters.userInfo.userId;
-          json.standId = this.listForm.standId;
+      json.prcCreateUserName = this.$store.getters.userInfo.uName;
-          this.$refs['listForm'].validate((valid) => {
+      json.standId = this.listForm.standId;
+      this.$refs["listForm"].validate((valid) => {
+        if (valid) {
+          this.$refs["roleForm"].validate((valid) => {
             if (valid) {
-              this.$refs['roleForm'].validate((valid) => {
+              this.isSubmit = true;
-                if (valid) {
+              this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  this.isSubmit = true
+                _this: this
-                  this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+              }, res => {
+                if (res.ok) {
+                  this.$http.post("lawss/activiti/completeTask", {
+                    taskIds: res.data,
+                    userId: this.$store.getters.userInfo.userId,
+                    json: JSON.stringify(json)
+                  }, {
                     _this: this
                   }, res => {
-                    if (res.ok) {
+                    if (res.success) {
-                      this.$http.post("lawss/activiti/completeTask", {
+                      this.$message.success(res.message);
-                        taskIds: res.data,
+                      this.$router.push("/processCenter");
-                        userId: this.$store.getters.userInfo.userId,
-                        json: JSON.stringify(json)
-                      }, {
-                        _this: this
-                      }, res => {
-                        if (res.success) {
-                          this.$message.success(res.message);
-                          this.$router.push("/processCenter");
-                        }
-                        this.isSubmit = false
-                      });
                     }
+                    this.isSubmit = false;
                   });
-                } else {
-                  return this.$message.warning("请完善人员信息");
                 }
               });
             } else {
-              return this.$message.warning("请完善基础信息");
+              return this.$message.warning("请完善人员信息");
             }
           });
+        } else {
+          return this.$message.warning("请完善基础信息");
+        }
+      });
     },
     choiceZRR(type, title, id) {
       this.nodeList = [];
@@ -584,13 +601,13 @@ export default {
   mounted() {
     this.getProjectData();
     // 查询各下拉框数据
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
       _this: this,
-      loading: 'loading'
+      loading: "loading"
     }, res => {
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
     }, e => {
-    })
+    });
   }
 };
 </script>

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

@@ -431,9 +431,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.bzFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -451,7 +448,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
   computed: {

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

@@ -275,12 +275,10 @@
       </div>
     </div>
     <ProcessFooter
-      show-back
       show-submit
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
-      @back="beforeBack"
       @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -407,34 +405,8 @@ export default {
         this.listForm.breakdownList = item.breakdownList;
       });
     },
-    //驳回事件
-    beforeBack() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
-        this.$message.warning('请填写审批意见')
-      } else {
-        this.listForm.bzFlag = "2";
-        this.listForm.commentText = this.commentText;
-        const json = JSON.stringify(this.listForm);
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-        }, e => {
-        });
-      }
-    },
     //提交事件
     handleSubmit() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
-        this.$message.warning('请填写审批意见')
-      } else {
         this.listForm.bzFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -451,7 +423,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
 

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

@@ -2,7 +2,7 @@
   <div class="xmpg2-step12">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程-项目</template>
-      <template slot="proNode">责任人审核</template>
+      <template slot="proNode">标准法规部部长审核</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -431,9 +431,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.dlFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
   computed: {

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

@@ -337,9 +337,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('审批意见不能为空')
-      }else{
         this.isSubmit = true
         this.listForm.BZFlag = "1";
         this.listForm.commentText = this.commentText;
@@ -359,7 +356,6 @@ export default {
         }, e => {
         });
       }
-      }
   },
   computed: {
     listNoDataText() {

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

@@ -106,6 +106,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">
@@ -333,9 +348,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) {
-        this.$message.warning("请选择架构经理");
-      } else {
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -353,7 +365,6 @@ export default {
           this.isSubmit = false
         }, e => {
         });
-      }
     },
     choiceZRR(scope, type, title, id) {
       if (scope != null) {

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

@@ -112,6 +112,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">
@@ -406,17 +421,15 @@ export default {
       }
     },
     checkedRole (data) {
-      let roleId = data[0].id
-      let roleName = data[0].name
       if (this.type === 1) {
-        this.dataList[this.zrIndex].liablePeopleId = roleId
+        this.dataList[this.zrIndex].liablePeopleId = data[0].id
-        this.dataList[this.zrIndex].liablePeople = roleName
+        this.dataList[this.zrIndex].liablePeople = data[0].name
       } else if(this.type === 2) {
         this.dataList.forEach( item => {
           this.selectList.forEach( items => {
             if (item.standId === items.standId) {
-              item.liablePeopleId = roleId
+              item.liablePeopleId = data[0].id
-              item.liablePeople = roleName
+              item.liablePeople = data[0].name
             }
           })
         })

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

@@ -98,6 +98,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">

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

@@ -236,6 +236,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">

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

@@ -432,9 +432,6 @@
             },
             //提交事件
             handleSubmit() {
-                if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
-                    this.$message.warning('请填写审批意见')
-                } else {
                     this.listForm.ffFlag = "1";
                     this.listForm.commentText = this.commentText;
                     const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@
                             this.$router.push("/processCenter");
                         }
                     });
-                }
             },
         },
         computed: {

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

@@ -431,9 +431,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.jgFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
   computed: {

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

@@ -431,9 +431,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.gcFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
           }
         }, e => {
         });
-      }
     },
   },
   computed: {

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

@@ -185,6 +185,9 @@
               prop="standName"
               label="标准名称"
           >
+            <template slot-scope="scope">
+              <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</span>
+            </template>
           </el-table-column>
           <el-table-column
               prop="issueTime"
@@ -273,12 +276,18 @@
             label="标准名称"
             width="260px"
         >
+          <template slot-scope="scope">
+            <a  @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="standEnName"
           align="center"
           width="180px"
           label="英文名称">
+          <template slot-scope="scope">
+            <a  @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="typeApplicable"

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

@@ -170,6 +170,9 @@
             prop="standName"
             label="标准名称"
           >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="issueTime"
@@ -257,12 +260,18 @@
           label="标准名称"
           width="260px"
         >
+          <template slot-scope="scope">
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="standEnName"
           align="center"
           width="180px"
           label="英文名称">
+          <template slot-scope="scope">
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="typeApplicable"

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

@@ -170,6 +170,9 @@
             prop="standName"
             label="标准名称"
           >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="issueTime"
@@ -257,12 +260,18 @@
           label="标准名称"
           width="260px"
         >
+          <template slot-scope="scope">
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="standEnName"
           align="center"
           width="180px"
           label="英文名称">
+          <template slot-scope="scope">
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
           prop="typeApplicable"

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

@@ -546,7 +546,13 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     back () {
-      this.$router.push(this.$store.state.detailMap)
+      console.log(this.$route.query.tabName);
+      this.$router.push({
+        path: this.$store.state.detailMap,
+        query: {
+          tabName: this.$route.query.tabName
+        }
+      })
       this.$store.commit('setDetailMap', '')
     },
     showLocalProductData (item) {
@@ -676,7 +682,6 @@ export default {
         _this: this,
         loading: 'loading'
       }, res => {
-        console.log(res.data)
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.setMap(this.zrbmMap,res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap,res.data.WBZTCLASS)

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

@@ -43,6 +43,7 @@
                 <el-table-column
                         prop="partCode"
                         label="章节编号"
+                        sortable
                         align="center"
                         width="180">
                 </el-table-column>

src/pages/searchCenter/pages/advancedSearch.vue

@@ -27,10 +27,8 @@
               {{ $t("m.clearQuery") }}
             </el-button>
           </div>
-          <el-button type="primary" @click="exportSearchResult" v-if="!kindtext" style="position: absolute;right:0px;width: 98px;background:#3391CE
+<!--          <el-button type="primary" @click="exportSearchResult" v-if="!kindtext" style="position: absolute;right:0px;width: 98px;background:#3391CE;border-color:#3391CE;">{{ $t("m.export") }}-->
-;border-color:#3391CE
+<!--          </el-button>-->
-;">{{ $t("m.export") }}
-          </el-button>
         </div>
         <div class="search-condition showWidth" v-if="kindtext">
           <div class="search-content">
@@ -932,65 +930,41 @@
                   align="center"
                   :label="$t('m.action')"
                   width="200">
-                  <template slot-scope="scope">
+                    <template slot-scope="scope">
-                    <div v-if="selectIndex !== 'DYNAMIC_INFORMATION' && selectIndex !== 'items'">
+                        <div v-if="selectIndex !== 'DYNAMIC_INFORMATION' && selectIndex !== 'items'">
-                      <div v-if="scope.row.collectId">
+                            <div v-if="scope.row.collectId">
-                        <el-button class="opera-btn" type="primary" size="mini"
+                                <el-dropdown trigger="click" @command="handleCommand">
-                                   @click="judgeRolePermiOnSar(scope.row, 1)">{{ $t("m.see") }}
+                                    <i class="iconfont">&#xe61e;</i>
-                        </el-button>
+                                    <el-dropdown-menu slot="dropdown">
-                        <el-dropdown trigger="click" @command="handleCommand">
+                                        <el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
-                          <el-button type="primary" class="opera-btn" style="margin-left: 10px" size="mini">
+                                        <el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item>
-                            {{ $t("m.more") }}
+                                        <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>
-                          </el-button>
+                                    </el-dropdown-menu>
-                          <el-dropdown-menu slot="dropdown">
+                                </el-dropdown>
-                            <el-dropdown-item :command="beforeHandleCommand('a',scope.row)"
+
-                                              v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">{{ $t("m.cancelCollection") }}
+                            </div>
-                            </el-dropdown-item>
+                            <div v-else>
-                            <el-dropdown-item :command="beforeHandleCommand('b',scope.row)"
+                                <el-dropdown trigger="click" @command="handleCommand">
-                                              v-btn-permission="'U43YC8BE2U5VHE9KJN87'">{{ $t("m.share") }}
+                                    <i class="iconfont">&#xe61e;</i>
-                            </el-dropdown-item>
+                                    <el-dropdown-menu slot="dropdown">
-                            <!--                           <el-dropdown-item :command="beforeHandleCommand('c',scope.row)">{{ $t('m.processes') }}</el-dropdown-item>-->
+                                        <el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
-                          </el-dropdown-menu>
+                                        <el-dropdown-item v-btn-permission="'FB3R3TVALD'" :command="beforeHandleCommand('d',scope.row)">收藏</el-dropdown-item>
-                        </el-dropdown>
+<!--                                        <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
-                      </div>
+                                    </el-dropdown-menu>
-                      <div v-else>
+                                </el-dropdown>
-                        <el-button class="opera-btn" type="primary" size="mini"
+
-                                   @click="judgeRolePermiOnSar(scope.row, 1)">{{ $t("m.see") }}
+                            </div>
-                        </el-button>
+                        </div>
-                        <el-dropdown trigger="click" @command="handleCommand">
+                        <div v-else-if="selectIndex === 'items'">
-                          <el-button type="primary" class="opera-btn" style="margin-left: 10px" size="mini">
+                            <!--                     <el-button size="mini" @click="judgeRolePermiOnSar(scope.row, 1)">查看</el-button>-->
-                            {{ $t("m.more") }}
+                            <el-button size="mini" @click="itemsDetails(scope.row)">查看</el-button>
-                          </el-button>
+                        </div>
-                          <el-dropdown-menu slot="dropdown">
+                        <div v-else>
-                            <el-dropdown-item :command="beforeHandleCommand('d',scope.row)"
+                            <el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>
-                                              v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">{{ $t("m.collection") }}
+                            <el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button>
-                            </el-dropdown-item>
+                            <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>
-                            <el-dropdown-item :command="beforeHandleCommand('b',scope.row)"
+                        </div>
-                                              v-btn-permission="'U43YC8BE2U5VHE9KJN87'">{{ $t("m.share") }}
+                    </template>
-                            </el-dropdown-item>
-                            <!--                           <el-dropdown-item :command="beforeHandleCommand('c',scope.row)">{{ $t('m.processes') }}</el-dropdown-item>-->
-                          </el-dropdown-menu>
-                        </el-dropdown>
-                      </div>
-                    </div>
-                    <div v-else-if="selectIndex === 'items'">
-                      <!--                     <el-button size="mini" @click="judgeRolePermiOnSar(scope.row, 1)">查看</el-button>-->
-                      <el-button class="opera-btn" size="mini" @click="itemsDetails(scope.row)">{{ $t("m.see") }}
-                      </el-button>
-                    </div>
-                    <div v-else class="celect-btn-box">
-                      <el-button class="opera-btn" size="mini" type="primary" v-if="scope.row.collectId"
-                                 @click="clickCollection(scope.row)" v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">
-                        {{ $t("m.cancelCollection") }}
-                      </el-button>
-                      <el-button class="opera-btn" size="mini" type="primary" v-else @click="clickCollection(scope.row)"
-                                 v-btn-permission="'JEFQ4RPSKZ44WZW8EUSU'">{{ $t("m.collection") }}
-                      </el-button>
-                      <el-button class="opera-btn" sizi="mini" @click="clickShare(scope.row)"
-                                 v-btn-permission="'U43YC8BE2U5VHE9KJN87'">{{ $t("m.share") }}
-                      </el-button>
-                    </div>
-                  </template>
                 </el-table-column>
               </el-table>
             </div>
@@ -1315,10 +1289,29 @@ export default {
       dropdownItemsCollect: [{ "val": "取消收藏" }, { "val": "分享" }, { "val": "流程" }],
       judgeRoleFlag: false,
       judgeRoleMessage: "",
-      exportSearchInfo: {}
+      exportSearchInfo: {},
+      twoOptions: [],
+      formFieldListStandData: []
     };
   },
   methods: {
+      getAddFormFieldList (isEdit) {
+          this.$http.get('lawss/sarStandAttrDetails/list', {}, {
+                  _this: this
+              },
+              res => {
+                  if (res.ok) {
+                      const { data = {} } = res
+                      // 国内外标准
+                      const inlandList = data['INLAND_STAND'] || []
+                      const foreignList = data['FOREIGN_STAND'] || []
+                      const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB');
+                      console.log(foreignFilterList)
+                      this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList);
+                      console.log(this.formFieldListStandData,'-----------------------------------1')
+                  }
+              }, e => {})
+      },
     choiceZRR1 (type, title, id) {
       this.drawerTitle = title
       this.modalShowFlag1 = true
@@ -1497,22 +1490,22 @@ export default {
         }
       }
     }, // 点击收藏/取消收藏事件
-    handleCommand(command) {
+    handleCommand (command) {
-      switch (command.command) {
+          switch (command.command) {
-        case "d":
+              case 'd':
-          this.judgeRolePermiOnSar(command.item, 2); // 收藏
+                  this.judgeRolePermiOnSar(command.item, 2) // 收藏
-          break;
+                  break
-        case "a":
+              case 'a':
-          this.judgeRolePermiOnSar(command.item, 3); // 取消收藏
+                  this.judgeRolePermiOnSar(command.item, 3) // 取消收藏
-          break;
+                  break
-        case "b":
+              case 'b':
-          this.judgeRolePermiOnSar(command.item, 4); // 分享
+                  this.judgeRolePermiOnSar(command.item, 4) // 分享
-          break;
+                  break
-        case "c":
+              case 'l':
-          this.judgeRolePermiOnSar(command.item, 6); // 流程
+                  this.judgeRolePermiOnSar(command.item, 1) // 查看
-          break;
+                  break
-      }
+          }
-    }, // 下拉菜单点击事件
+      }, // 下拉菜单点击事件
     beforeHandleCommand(command, item) {
       return {
         "item": item,
@@ -1658,37 +1651,19 @@ export default {
             pagetype = "BUSINESS_STAND";
           }
         }
-        this.$http.get("lawss/sarMenu/judgeSarMenuByRole", {
+          if (type === 1) {
-          sarId: item.id,
-          sarType: pagetype
-        }, {
-          _this: this
-        }, res => {
-          if (res.ok) {
-            this.judgeRoleFlag = true;
-            if (type === 1) {
               this.detailsStandardLaws(item);
-            } else if (type === 2) {
+          } else if (type === 2) {
               this.collectStandard(item);
-            } else if (type === 3) {
+          } else if (type === 3) {
               this.cancelCollectStandard(item);
-            } else if (type === 4) {
+          } else if (type === 4) {
               this.shareSarInfo(item);
-            } else if (type === 5) {
+          } else if (type === 5) {
               this.showRecommendDetials(item);
-            } else if (type === 6) {
+          } else if (type === 6) {
               this.goProcess(item);
-            }
-          } else {
-            this.judgeRoleFlag = false;
-            this.$message({
-              message: res.message,
-              type: "error"
-            });
           }
-        }, e => {
-          this.judgeRoleFlag = false;
-        });
       }
     },
     showDetailsByRole(item) {
@@ -1722,64 +1697,20 @@ export default {
       this.standForm.page = this.page;
       this.standForm.pageSize = this.$store.getters.userInfo.configContent;
       let nowStandForm = JSON.parse(JSON.stringify(this.standForm));
-      if (this.standForm.issueTime != null && this.standForm.issueTime !== "") {
+      // 处理动态表单的时间和下拉框格式
-        nowStandForm.issueTime = this.$dateFormat(this.standForm.issueTime, "yyyy-MM-dd hh:mm:ss");
+      const formFieldList = this.formFieldListStandData
-      }
+      const sarStandAttrObj = {}
-      if (this.standForm.issueTimeSt != null && this.standForm.issueTimeSt !== "") {
+      formFieldList.forEach((item) => {
-        nowStandForm.issueTimeSt = this.$dateFormat(this.standForm.issueTimeSt, "yyyy-MM-dd hh:mm:ss");
+         const attrField = item.attrField.toLowerCase();
-      }
+         const value = nowStandForm[attrField]
-      if (this.standForm.issueTimeEd != null && this.standForm.issueTimeEd !== "") {
+          // 时间格式处理
-        nowStandForm.issueTimeEd = this.$dateFormat(this.standForm.issueTimeEd, "yyyy-MM-dd hh:mm:ss");
+          if (item.attrType === 'DATE_PICKER' && value) {
-      }
+            nowStandForm[item.attrField] = this.standForm[attrField]
-      if (this.standForm.putTime != null && this.standForm.putTime !== "") {
+          }
-        nowStandForm.putTime = this.$dateFormat(this.standForm.putTime, "yyyy-MM-dd hh:mm:ss");
+            sarStandAttrObj[item.attrField] = nowStandForm[attrField]
-      }
+        })
-      if (this.standForm.putTimeSt != null && this.standForm.putTimeSt !== "") {
+      nowStandForm['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
-        nowStandForm.putTimeSt = this.$dateFormat(this.standForm.putTimeSt, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.putTimeEd != null && this.standForm.putTimeEd !== "") {
-        nowStandForm.putTimeEd = this.$dateFormat(this.standForm.putTimeEd, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.newproductPutTime != null && this.standForm.newproductPutTime !== "") {
-        nowStandForm.newproductPutTime = this.$dateFormat(this.standForm.newproductPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.registerPutTime != null && this.standForm.registerPutTime !== "") {
-        nowStandForm.registerPutTime = this.$dateFormat(this.standForm.registerPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.productPutTime != null && this.standForm.productPutTime !== "") {
-        nowStandForm.productPutTime = this.$dateFormat(this.standForm.productPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.productPutTimeSt != null && this.standForm.productPutTimeSt !== "") {
-        nowStandForm.productPutTimeSt = this.$dateFormat(this.standForm.productPutTimeSt, "yyyy-MM-dd hh:mm:ss");
-      } else {
-        nowStandForm.productPutTimeSt = "";
-      }
-      if (this.standForm.productPutTimeEd != null && this.standForm.productPutTimeEd !== "") {
-        nowStandForm.productPutTimeEd = this.$dateFormat(this.standForm.productPutTimeEd, "yyyy-MM-dd hh:mm:ss");
-      } else {
-        nowStandForm.productPutTimeEd = "";
-      }
-      if (this.standForm.newcarPutTime != null && this.standForm.newcarPutTime !== "") {
-        nowStandForm.newcarPutTime = this.$dateFormat(this.standForm.newcarPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.newcarPutTimeSt != null && this.standForm.newcarPutTimeSt !== "") {
-        nowStandForm.newcarPutTimeSt = this.$dateFormat(this.standForm.newcarPutTimeSt, "yyyy-MM-dd hh:mm:ss");
-      } else {
-        nowStandForm.newcarPutTimeSt = "";
-      }
-      if (this.standForm.newcarPutTimeEd != null && this.standForm.newcarPutTimeEd !== "") {
-        nowStandForm.newcarPutTimeEd = this.$dateFormat(this.standForm.newcarPutTimeEd, "yyyy-MM-dd hh:mm:ss");
-      } else {
-        nowStandForm.newcarPutTimeEd = "";
-      }
-      if (this.standForm.firstPutTime != null && this.standForm.firstPutTime !== "") {
-        nowStandForm.firstPutTime = this.$dateFormat(this.standForm.firstPutTime, "yyyy-MM-dd hh:mm:ss");
-      }
-      if (this.standForm.putYear != null && this.standForm.putYear !== "") {
-        nowStandForm.putYear = this.$dateFormat(this.standForm.putYear, "yyyy");
-      }
       this.exportSearchInfo = nowStandForm;
-      nowStandForm['sarStandAttrEOStr'] = JSON.stringify(nowStandForm).replace(/"/g, "'")
       this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, {
         _this: this,
         loading: "resultLoading"
@@ -1920,20 +1851,13 @@ export default {
       let routername = "";
       let pagetype = "";
       if (item.type === "stand") {
-        if (this.$hasPermission("CFEZ3VP7EA95CTRBH3JB") || this.$hasPermission("R5DNG6EZC66CNFC4RHPH")) {
+          if (item.standType === "INLAND") {
-          if (item.stand_type === "INLAND") {
+              routername = "OtherStandardDetails";
-            routername = "OtherStandardDetails";
+              pagetype = "INLAND_STAND";
-            pagetype = "INLAND_STAND";
           } else {
-            routername = "OtherForeignDetails";
+              routername = "OtherForeignDetails";
-            pagetype = "FOREIGN_STAND";
+              pagetype = "FOREIGN_STAND";
           }
-        } else {
-          this.$message({
-            message: "无权访问",
-            type: "warning"
-          });
-        }
       } else if (item.type === "laws") {
         if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) {
           routername = "OtherLawsDetails";
@@ -2349,6 +2273,7 @@ export default {
   computed: {
     // 条件按钮提示
     toggleConditionTips() {
+        this.standForm.selectValue = ''
       return this.kindtext ? "收起条件" : "展开条件";
     }
   },
@@ -2408,6 +2333,7 @@ export default {
     // 加载表格
     this.searchSarBykey();
     this.showBuyRole();
+    this.getAddFormFieldList();
     // 组织结构
     this.getOrgTreeSource();
     // this.selectBussRoleMsg();

src/pages/searchCenter/pages/standardSearch.vue

@@ -212,7 +212,7 @@ export default {
     //查询选项
     queryOptions() {
       let _this = this;
-      this.$http.post("search/searchCenter/getMenu", {}, {
+      this.$http.post("search/getMenu", {}, {
         _this: this
       }, res => {
         _this.searchData = [

src/sysConfig/index.js

@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '10.96.10.171'
 // const devInterfacePORT = '9999'
-const devIp = '10.96.170.156'
+const devIp = '192.168.0.104'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'