Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/components/navMenu/index.vue

@@ -305,11 +305,11 @@ export default {
         //       path: '/convertDocView',
         //       menuId: '3F52K25546'
         //     },
-            {
+            /*{
               title: '菜单管理',
               path: '/menuManage',
               menuId: '87b8b4f5817a7829696e63185c744d52'
-            },
+            },*/
             {
               title: '链接管理',
               path: '/linkManage',

src/pages/details/otherStandardDetails/index.vue

@@ -376,12 +376,12 @@
                                 <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                             </template>
                         </p>
-                        <!--                <el-button-->
+                                        <el-button
-                        <!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+                                          v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
-                        <!--                  @click="showItemsModel(child.attrField)"-->
+                                          @click="showItemsModel(child.attrField)"
-                        <!--                  class="decomposition-btn"-->
+                                          class="decomposition-btn"
-                        <!--                  icon="icon-separate"-->
+                                          icon="icon-separate"
-                        <!--                >标准分解单</el-button>-->
+                                        >标准分解单</el-button>
                     </div>
                 </div>
 

src/pages/localTool/standAutoSplit/index.vue

@@ -186,12 +186,20 @@
               prop="standNumber"
               label="标准号/政策号"
               align="center">
+            <template slot-scope="scope">
+              <a class="table-jump"
+                 @click="handlePreview1(scope.row)">{{ scope.row.standNumber }}</a>
+            </template>
           </el-table-column>
           <el-table-column
               prop="standName"
               label="标准名称/政策名称"
               align="center"
           >
+            <template slot-scope="scope">
+              <a class="table-jump"
+                 @click="handlePreview1(scope.row)">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
               prop="standFileClassifyShow"
@@ -819,6 +827,17 @@ export default {
       })
       window.open(routeUrl.href, '_blank')
     },
+    //拆分页点击查看详情
+    handlePreview1(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.standId,
+          pageType: item.sarType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     // 查询政策和标准
     getSearch () {
       if (this.conditionForm.standType === 'FOREIGN2') {

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -39,7 +39,7 @@
           <div class="action-bar">
             <el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'"  size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
             <el-button v-btn-permission="''"   size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
-            <el-button v-btn-permission="''"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
+<!--            <el-button v-btn-permission="''"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>-->
             <el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'"   size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
             <el-button v-btn-permission="''"   size="mini" @click="batchCopy">批量复制</el-button>
             <el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'"   size="mini" @click="combineItems">合并条款</el-button>

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

@@ -190,7 +190,7 @@
           <p>点击或拖拽上传文件</p>
         </div>
       </el-upload>
-      <el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress>
+<!--      <el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress>-->
     </el-dialog>
   </div>
 </template>

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

@@ -103,13 +103,13 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="170"
+                        width="230"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
-                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
@@ -597,13 +597,13 @@
                     //     this.form.itemsNum = bringData[0].showNumber
                     //     this.form.itemsName = bringData[0].standName
                     // }
-                    this.form.standId = bringData[0].id
+                    this.form.standId = bringData[0].standId
                     this.sarType = bringData[0].standType
                     this.standId = bringData[0].standId
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
-                        infoId: this.form.standId,
+                        infoId: bringData[0].id,
                         page: 1,
                         pageSize: 9999
                     }, {

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

@@ -104,13 +104,13 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="170"
+                        width="230"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
-                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
@@ -602,13 +602,13 @@
                     //     this.form.itemsNum = bringData[0].showNumber
                     //     this.form.itemsName = bringData[0].standName
                     // }
-                    this.form.standId = bringData[0].id
+                    this.form.standId = bringData[0].standId
                     this.sarType = bringData[0].standType
                     this.standId = bringData[0].standId
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
-                        infoId: this.form.standId,
+                        infoId: bringData[0].id,
                         page: 1,
                         pageSize: 9999
                     }, {

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

@@ -98,13 +98,13 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="170"
+                        width="230"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
-                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column

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

@@ -99,15 +99,15 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="100"
+                        width="230"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itemsTitle"
+                        label="条款内容"
                         align="center">
                 </el-table-column>
-<!--                <el-table-column-->
-<!--                        prop="itemsTitle"-->
-<!--                        label="条款内容"-->
-<!--                        show-overflow-tooltip-->
-<!--                        align="center">-->
-<!--                </el-table-column>-->
                 <el-table-column
                         prop="technicalRequir"
                         width="150"

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

@@ -94,13 +94,13 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="100"
+                        width="230"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsTitle"
                         label="条款内容"
-                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column

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

@@ -94,13 +94,13 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="100"
+                        width="230"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsTitle"
                         label="条款内容"
-                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column

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

@@ -95,13 +95,13 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="100"
+                        width="230"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsTitle"
                         label="条款内容"
-                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column

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

@@ -397,7 +397,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveinboundTask } from "api/process";
+import { inboundLiaisonDetail,  saveTaskForPub } from "api/process";
 
 export default {
   name: "bzqdfbStep3",
@@ -693,16 +693,24 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
-        this.listForm.prcNum = this.prcNum
+        if(item.form === undefined){
-        this.listForm.prcName = this.prcName
+          this.listForm.prcNum = this.prcNum
-        this.listForm['id'] = item.id
+          this.listForm.prcName = this.prcName
-        this.listForm.dataList = item.dataList
+          this.listForm['id'] = item.id
-        this.dataList = item.dataList
+          this.listForm.dataList = item.dataList
-        this.listForm.applyUpdUserId = item.applyUpdUserId
+          this.dataList = item.dataList
-        this.listForm.jlUserId = item.jlUserId
+          this.listForm.applyUpdUserId = item.applyUpdUserId
-        this.listForm.zrUserId = item.zrUserId
+          this.listForm.jlUserId = item.jlUserId
-        this.fileIds = item.fileId;
+          this.listForm.zrUserId = item.zrUserId
-        this.getFileInfo();
+          this.fileIds = item.fileId;
+          this.getFileInfo();
+         } else {
+          this.listForm = item.form
+          this.dataList = item.form.dataList
+          this.listForm.dataList = item.form.dataList
+          this.fileIds = item.form.fileId;
+          this.getFileInfo();
+        }
       })
     },
     //保存事件
@@ -713,23 +721,19 @@ export default {
       _formData.append("createUser", this.$store.getters.userInfo.userId);
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "4");
+      _formData.append('taskIds', this.taskIds)
       _formData.append("json", JSON.stringify({
-        taskInfo: '根据会签意见修订',
         form: this.listForm,
-        roleForm: this.roleForm,
-        prcNum: this.$route.query.prcNum,
-        taskIds: this.$route.query.taskIds,
-        pId: this.$route.query.prcId,
         commentText: this.commentText
       }));
-      saveinboundTask(_formData).then(res => {
+
-        this.saveLoading = false;
+      // saveTaskForPub(_formData).then(res => {
-        this.$message.success("保存成功");
+      //   this.saveLoading = false;
-        this.$router.push('/processCenter')
+      //   this.$message.success("保存成功");
-        this.bpnId = res.result;
+      //   this.bpnId = res.result;
-      }).catch(e => {
+      // }).catch(e => {
-        this.saveLoading = false;
+      //   this.saveLoading = false;
-      });
+      // });
     },
     //提交事件
     handleSubmit() {

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

@@ -217,14 +217,15 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.xgdName">
-                                        {{ form.xgdName }}
+<!--                                        {{ form.xgdName }}-->
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
                                                 size="mini"
                                                 style="margin-left: 10px"
                                                 @click="fileUpload('xgd')">
-                                            重新上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                           查看已上传的文件
                                         </el-button>
                                     </div>
                                     <div v-else>
@@ -233,7 +234,8 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('xgd')">
-                                            点击上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                              点击上传
                                         </el-button>
                                     </div>
                                 </el-form-item>
@@ -245,14 +247,15 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.fbgbjbdName">
-                                        {{ form.fbgbjbdName }}
+<!--                                        {{ form.fbgbjbdName }}-->
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
                                                 size="mini"
                                                 style="margin-left: 10px"
                                                 @click="fileUpload('fbgbjbd')">
-                                            重新上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                         查看已上传的文件
                                         </el-button>
                                     </div>
                                     <div v-else>
@@ -261,6 +264,7 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('fbgbjbd')">
+                                          <i class="el-icon-upload el-icon--right"></i>
                                             点击上传
                                         </el-button>
                                     </div>
@@ -273,14 +277,15 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.zbjbdName">
-                                        {{ form.zbjbdName }}
+<!--                                        {{ form.zbjbdName }}-->
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
                                                 size="mini"
                                                 style="margin-left: 10px"
                                                 @click="fileUpload('zbjbd')">
-                                            重新上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                         查看已上传的文件
                                         </el-button>
                                     </div>
                                     <div v-else>
@@ -289,6 +294,7 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('zbjbd')">
+                                          <i class="el-icon-upload el-icon--right"></i>
                                             点击上传
                                         </el-button>
                                     </div>
@@ -301,14 +307,15 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.bpgName">
-                                        {{ form.bpgName }}
+<!--                                        {{ form.bpgName }}-->
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
                                                 size="mini"
                                                 style="margin-left: 10px"
                                                 @click="fileUpload('bpg')">
-                                            重新上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                         查看已上传的文件
                                         </el-button>
                                     </div>
                                     <div v-else>
@@ -317,6 +324,7 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('bpg')">
+                                          <i class="el-icon-upload el-icon--right"></i>
                                             点击上传
                                         </el-button>
                                     </div>
@@ -329,14 +337,15 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.ssgName">
-                                        {{ form.ssgName }}
+<!--                                        {{ form.ssgName }}-->
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
                                                 size="mini"
                                                 style="margin-left: 10px"
                                                 @click="fileUpload('ssg')">
-                                            重新上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                         查看已上传的文件
                                         </el-button>
                                     </div>
                                     <div v-else>
@@ -345,6 +354,7 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('ssg')">
+                                          <i class="el-icon-upload el-icon--right"></i>
                                             点击上传
                                         </el-button>
                                     </div>
@@ -359,14 +369,15 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.kwjName">
-                                        {{ form.kwjName }}
+<!--                                        {{ form.kwjName }}-->
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
                                                 size="mini"
                                                 style="margin-left: 10px"
                                                 @click="fileUpload('kwj')">
-                                            重新上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                         查看已上传的文件
                                         </el-button>
                                     </div>
                                     <div v-else>
@@ -375,6 +386,7 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('kwj')">
+                                          <i class="el-icon-upload el-icon--right"></i>
                                             点击上传
                                         </el-button>
                                     </div>
@@ -387,14 +399,15 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.zqyjgName">
-                                        {{ form.zqyjgName }}
+<!--                                        {{ form.zqyjgName }}-->
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
                                                 size="mini"
                                                 style="margin-left: 10px"
                                                 @click="fileUpload('zqyjg')">
-                                            重新上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                         查看已上传的文件
                                         </el-button>
                                     </div>
                                     <div v-else>
@@ -403,6 +416,7 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('zqyjg')">
+                                          <i class="el-icon-upload el-icon--right"></i>
                                             点击上传
                                         </el-button>
                                     </div>
@@ -415,14 +429,15 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.caName">
-                                        {{ form.caName }}
+<!--                                        {{ form.caName }}-->
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
                                                 size="mini"
                                                 style="margin-left: 10px"
                                                 @click="fileUpload('ca')">
-                                            重新上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                         查看已上传的文件
                                         </el-button>
                                     </div>
                                     <div v-else>
@@ -431,6 +446,7 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('ca')">
+                                          <i class="el-icon-upload el-icon--right"></i>
                                             点击上传
                                         </el-button>
                                     </div>
@@ -443,14 +459,15 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.jdwjName">
-                                        {{ form.jdwjName }}
+<!--                                        {{ form.jdwjName }}-->
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
                                                 size="mini"
                                                 style="margin-left: 10px"
                                                 @click="fileUpload('jdwj')">
-                                            重新上传
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                         查看已上传的文件
                                         </el-button>
                                     </div>
                                     <div v-else>
@@ -459,6 +476,7 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('jdwj')">
+                                          <i class="el-icon-upload el-icon--right"></i>
                                             点击上传
                                         </el-button>
                                     </div>
@@ -702,7 +720,16 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.glwjName">
-                                        {{ form.glwjName }}
+
+                                      <el-button
+                                          type="primary"
+                                          class="common-button-primary"
+                                          size="mini"
+                                          @click="fileUpload('glwj')">
+                                        <i class="el-icon-upload el-icon--right"></i>
+                                        查看已上传文件
+                                      </el-button>
+<!--                                        {{ form.glwjName }}-->
                                     </div>
                                     <div v-else>
                                         <el-button
@@ -710,6 +737,7 @@
                                                 class="common-button-primary"
                                                 size="mini"
                                                 @click="fileUpload('glwj')">
+                                          <i class="el-icon-upload el-icon--right"></i>
                                             点击上传
                                         </el-button>
                                     </div>
@@ -1196,6 +1224,16 @@
         data () {
             return {
               fileList: [],
+              caFileList: [],
+              FBGBJBDFileList: [],
+              xgdFileList: [],
+              bpgFileList: [],
+              ssgFileList: [],
+              zqyjgFileList: [],
+              jdwjFileList: [],
+              zbjbdFileList: [],
+              kwjFileList: [],
+              qlwjFileList: [],
               filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
@@ -1332,7 +1370,7 @@
                     zqyjg: '', // 征求意见稿
                     jdwj: '', // 解读文件
                     zbjbd: '', // 增补件
-                    kwj: '', // 勘误件
+                    kwj: '', // 勘 误件
                     caName: '', // 草案
                     fbgbjbdName: '', // 发布稿
                     xgdName: '', // 修改单
@@ -1413,9 +1451,9 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ]
                   ,
-                    // issueTime: [
+                    issueTime: [
-                    //     { required: true, message: '请选择标准发布日期', trigger: 'change' }
+                        { required: false, message: '请选择标准发布日期', trigger: 'change' }
-                    // ],
+                    ],
                     qcdw: [
                         { required: true, message: '请选择起草单位', trigger: 'change' }
                     ],
@@ -2040,43 +2078,54 @@
             // 导入标准数据成功后执行
             importFileSuccess (response, file,fileList) {
               // 上传成功后判断是否是两条数据是的话替换掉旧数据
-              if (fileList.length > 1) {
+              // if (fileList.length > 1) {
-                this.fileList = fileList.splice(0, 1)
+              //   this.fileList = fileList.splice(0, 1)
-              }
+              // }
                 if (response.ok) {
-                    this.fileMadel = false
+                    // this.fileMadel = false
-                    this.fileList = []
+                    // this.fileList = []
                     if(this.fileType === 'fbgbjbd'){
+                        this.FBGBJBDFileList=fileList;
                         this.form.fbgbjbd = response.data.id;
                         this.form.fbgbjbdName = response.data.name;
                     }else if(this.fileType === 'xgd'){
-                        this.form.xgd = response.data.id;
+                      this.xgdFileList=fileList;
+                      this.form.xgd = response.data.id;
                         this.form.xgdName = response.data.name;
                     }else if(this.fileType === 'bpg'){
+                      this.bpgFileList=fileList;
                         this.form.bpg = response.data.id;
                         this.form.bpgName = response.data.name;
                     }else if(this.fileType === 'ssg'){
+                      this.ssgFileList=fileList;
                         this.form.ssg = response.data.id;
                         this.form.ssgName = response.data.name;
                     }else if(this.fileType === 'zqyjg'){
+                      this.zqyjgFileList=fileList;
                         this.form.zqyjg = response.data.id;
                         this.form.zqyjgName = response.data.name;
                     }else if(this.fileType === 'jdwj'){
+                      this.jdwjFileList=fileList;
                         this.form.jdwj = response.data.id;
                         this.form.jdwjName = response.data.name;
                     }else if(this.fileType === 'kwj'){
+                      this.kwjFileList=fileList;
                         this.form.kwj = response.data.id;
                         this.form.kwjName = response.data.name;
                     }else if(this.fileType === 'xgd'){
+                      this.xgdFileList=fileList;
                         this.form.xgd = response.data.id;
                         this.form.xgdName = response.data.name;
                     }else if(this.fileType === 'glwj'){
+                      this.qlwjFileList=fileList;
                         this.form.glwj = response.data.id;
                         this.form.glwjName = response.data.name;
                     }else if(this.fileType === 'ca'){
+                      this.caFileList=fileList;
                         this.form.ca = response.data.id;
                         this.form.caName = response.data.name;
                     }else if(this.fileType === 'zbjbd'){
+                      this.zbjbdFileList=fileList;
                         this.form.zbjbd = response.data.id;
                         this.form.zbjbdName = response.data.name;
                     }
@@ -2089,8 +2138,33 @@
             },
             fileUpload (type) {
                 this.fileType = '';
-                this.fileMadel = true
+                // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
+
                 this.fileType = type;
+                if (type==='ca'){
+                  this.fileList=this.caFileList;
+                }else if (type==='fbgbjbd'){
+                  this.fileList=this.FBGBJBDFileList;
+                }else if (type==='xgd'){
+                  this.fileList=this.xgdFileList;
+                }else if(type==='bpg'){
+                  this.fileList=this.bpgFileList;
+                }else if (type==='ssg'){
+                  this.fileList=this.ssgFileList;
+                }else if (type==='zqyjg'){
+                  this.fileList=this.zqyjgFileList;
+                }else if (type==='jdwj'){
+                  this.fileList=this.jdwjFileList;
+                }else if (type==='zbjbd'){
+                  this.fileList=this.zbjbdFileList;
+                }else if (type==='kwj'){
+                  this.fileList=this.kwjFileList;
+                }else if (type==='glwj'){
+                  this.fileList=this.qlwjFileList;
+                }
+
+              this.fileMadel = true;
+
             },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {

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

@@ -836,29 +836,26 @@ export default {
   methods: {
     downloadFile (fileType) {
       if(fileType === 'fbgbjbd'){
-        if(this.fbgbjbdFileId.search(',')){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",","");
-          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
+
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",","");
       }else if(fileType === 'bpg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",","");
       }else if(fileType === 'ssg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",","");
       }else if(fileType === 'zqyjg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",","");
       }else if(fileType === 'jdwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",","");
       }else if(fileType === 'kwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",","");
       }else if(fileType === 'glwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",","");
       }else if(fileType === 'ca'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",","");
       }else if(fileType === 'zbjbd'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",","");
       }
     },
     popoverHide (checkedIds, checkedData) {

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

@@ -1138,13 +1138,13 @@ export default {
           { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
         ],
         standNature: [
-          { required: false, message: '请选择标准性质', trigger: 'change' }
+          { required: true, message: '请选择标准性质', trigger: 'change' }
         ],
         textStatus: [
           { required: true, message: '请选择文本状态', trigger: 'change' }
         ],
         issueTime: [
-          { required: true, message: '请选择标准发布日期', trigger: 'change' }
+          { required: false, message: '请选择标准发布日期', trigger: 'change' }
         ],
         qcdw: [
           { required: true, message: '请选择起草单位', trigger: 'change' }

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

@@ -281,6 +281,7 @@ export default {
         cid: '', // 编号
         endTime: '', // 结束日期
         cname: '', // 名称
+        standType: '',
       },
       formRules: {
         cid: [
@@ -454,6 +455,7 @@ export default {
         } else {
           this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
         }
+        this.form.standType = bringData[0].standType
         this.form.cname = bringData[0].standName;
         this.listModel = false;
       } else if (this.selectedList.length > 1) {

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

@@ -533,9 +533,14 @@ export default {
       }).then(res => {
         let mes = JSON.parse(res.mes);
         this.listForm = mes.form;
-        this.dataList = mes.form.dataList;
         this.roleForm = mes.roleForm;
         this.commentText = mes.commentText;
+        this.dataList = mes.form.dataList;
+        this.dataList.forEach(item => {
+         if(!item.productLine){
+           this.dataList = null
+         }
+        })
       });
     },
     checkedRole(data) {
@@ -755,8 +760,10 @@ export default {
     //选择拆分标准确定事件
     OkDrawer() {
       if (this.selectedList.length == 1) {
-        this.listForm.standNumber = this.selectedList[0].standNumber;
+        this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
         this.listForm.standName = this.selectedList[0].standName;
+        this.listForm.standType = this.selectedList[0].standType;
+        this.listForm.standId = this.selectedList[0].id;
         this.listForm.id = this.selectedList[0].id;
         this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
           ids: this.listForm.id,
@@ -866,12 +873,12 @@ export default {
   },
   computed: {},
   watch: {
-    dataList: {
+    // dataList: {
-      deep: true,
+    //   deep: true,
-      handler (val) {
+    //   handler (val) {
-        console.log('dataList update', val)
+    //     console.log('dataList update', val)
-      }
+    //   }
-    }
+    // }
   },
   mounted() {
     //从数据库中查询下拉框数据

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

@@ -470,6 +470,7 @@ export default {
       listForm: {
         standNumber: "", //标准编号
         standName: "",//标准名称
+        standType: "", //标准类型
         XCXSSRQ: "", //新车型实施日期
         ZCCSSRQ: "", //在产车实施日期
         certifiedEngineer: "", //认证工程师
@@ -662,7 +663,6 @@ export default {
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false;
         this.$message.success("保存成功");
-        this.$router.push("/processCenter");
       }).catch(e => {
         this.saveLoading = false;
       });
@@ -733,8 +733,10 @@ export default {
     //选择拆分标准确定事件
     OkDrawer() {
       if (this.selectedList.length === 1) {
-        this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
+        this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
         this.listForm.standName = this.selectedList[0].standName;
+        this.listForm.standType = this.selectedList[0].standType;
+        this.listForm.standId = this.selectedList[0].id;
         this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj
         this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj
         this.listForm.id = this.selectedList[0].id;

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

@@ -64,7 +64,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
+          height="56%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column

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

@@ -64,7 +64,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
+          height="55%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column

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

@@ -64,7 +64,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
+          height="55%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column

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

@@ -64,7 +64,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
+          height="55%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column

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

@@ -370,7 +370,6 @@ export default {
       if(this.peopleFlag === true){
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
-        console.log(json)
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -429,17 +428,19 @@ export default {
     },
     checkedRole (data) {
       if (this.type === 1) {
-        this.dataList[this.zrIndex].liablePeopleId = data[0].id
+        const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]))
-        this.dataList[this.zrIndex].liablePeople = data[0].name
+        newRow.liablePeopleId = data[0].id
-        this.$forceUpdate()
+        newRow.liablePeople = data[0].name
+        this.$set(this.dataList, this.zrIndex, newRow)
       } else if(this.type === 2) {
-        this.dataList.forEach( item => {
+        this.dataList.forEach((item, index) => {
           this.selectList.forEach( items => {
             if (item.standId === items.standId) {
-              item.liablePeopleId = data[0].id
+              const newRow = JSON.parse(JSON.stringify(item))
-              item.liablePeople = data[0].name
+              newRow.liablePeopleId = data[0].id
+              newRow.liablePeople = data[0].name
+              this.$set(this.dataList, index, newRow)
             }
-            this.$forceUpdate()
           })
         })
       }

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

@@ -64,7 +64,7 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standEnName"
+            prop="standNumber"
             label="标准号"
           >
             <template slot-scope="scope">
@@ -315,7 +315,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg)
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -333,6 +333,8 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.dataList = item.dataList;
+        console.log(this.dataList);
+        // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
         let children = [];
         item.breakdownList.forEach(
           item => {

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

@@ -400,7 +400,6 @@ export default {
   methods: {
     // 点击查看
     handlePreview(item) {
-      console.log(item)
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
@@ -471,13 +470,11 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        console.log(this.listForm)
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         // this.listForm.dataList = item.dataList;
         this.dataList = this.listForm.dataList;
-        console.log(this.dataList)
       });
     },
     //保存事件

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -9,9 +9,9 @@
         <div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-project></list-project>
         </div>
-        <div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+<!--        <div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-tracking></list-tracking>
-        </div>
+        </div>-->
         <div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-other></list-other>
         </div>
@@ -68,13 +68,13 @@ export default {
               name: "listProject"
             });
             continue;
-          } else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
+          }/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
             list.push({
               label: "重点标准跟踪清单",
               name: "listTracking"
             });
             continue;
-          } else if (entity.id === "5a75523729b04102a565167004d640e9") {
+          }*/ else if (entity.id === "5a75523729b04102a565167004d640e9") {
             list.push({
               label: "其他清单",
               name: "listOther"

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

@@ -646,7 +646,6 @@ export default {
     },
     // 点击查看
     handlePreview(data) {
-      debugger
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {

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

@@ -12,8 +12,14 @@
           <el-row style="margin-top: 10px">
             <el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
             <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
-            <el-col :span="5" :push="2">项目名称: <span class="valueColor">{{ localProEO.projectName }}</span></el-col>
+            <el-col :span="5" :push="2">
-            <!--          <el-col :span="5" :push="2">车型系列:<span class="valueColor">{{ localProEO.productSet }}</span></el-col>-->
+              <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
+                <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div>
+                <div v-else></div>
+                <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div>
+                <div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div>
+              </el-tooltip>
+            </el-col>
             <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
             </el-col>
           </el-row>
@@ -449,7 +455,7 @@ export default {
           let deleteTagList = []
           this.selectList1.forEach(item => {
             //项目id-标准id,项目id-标准id
-            deleteTagList.push( this.proId + '-' + item )
+            deleteTagList.push(this.proId + '-' + item)
           })
           this.id = deleteTagList.join(',')
           this.$http.post('sarStandProjectLibrary/deleteByIds', {
@@ -726,6 +732,7 @@ export default {
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap, res.data.WBZTCLASS)
+        console.log(this.getLocalPro)
         this.showLocalProductData(this.getLocalPro)
       }, e => {
       })

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

@@ -60,13 +60,18 @@
             width="180"
         >
           <template slot-scope="scope">
-            <div><span>{{ scope.row.standSort }} {{ scope.row.standNumber }}</span> <span v-if="scope.row.standYear">-{{ scope.row.standYear }}</span></div>
+            <a class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
             prop="standName"
             label="标准/政策名称"
         >
+          <template slot-scope="scope">
+            <a class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
                 prop="interpretationTime"
@@ -322,6 +327,17 @@ export default {
           this.$store.getters.userInfo.configContent = pageSize
           this.queryStandAndLaws()
       },
+      //点击查看详情
+      handlePreview(item) {
+        let routeUrl = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.standId,
+            pageType: 'INLAND_STAND'
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      },
       queryStandAndLaws () {
           this.sarProject.current = this.page
           this.sarProject.size = this.pageSize

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -65,14 +65,19 @@
             label="标准/政策号"
             width="180"
         >
-            <template slot-scope="scope">
+          <template slot-scope="scope">
-                <div><span>{{ scope.row.standSort }} {{ scope.row.standNumber }}</span> <span v-if="scope.row.standYear">-{{ scope.row.standYear }}</span></div>
+            <a class="table-jump"
-            </template>
+               @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+          </template>
         </el-table-column>
         <el-table-column
             prop="standName"
             label="标准/政策名称"
         >
+          <template slot-scope="scope">
+            <a class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
                 prop="interpretationTime"
@@ -259,7 +264,19 @@ name: "technologyInvolveProject",
               this.sarProjectListDatas = res.data.records
               this.total = res.data.total
           }, e=> {})
-      }, // 分页查询
+      },
+      //点击查看详情
+      handlePreview(item) {
+        let routeUrl = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      },
+      // 分页查询
       resetSelect () {
           this.sarProject.country = ''
           this.sarProject.standCode=''

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

@@ -11,19 +11,19 @@
             <div v-show="heightShow" class="transition-box">
                 <p class="transition-box-p">
                     <label class="transition-box-label">标准号：</label>
-                    <span class="transition-box-span">{{ this.$route.query.item.cid }}</span>
+                    <span class="transition-box-span" @click="handlePreview($route.query.item)">{{ $route.query.item.cid }}</span>
                 </p>
                 <p class="transition-box-p">
                     <label class="transition-box-label">标准名称：</label>
-                    <span class="transition-box-span">{{ this.$route.query.item.cname || '-' }}</span>
+                    <span class="transition-box-span">{{ $route.query.item.cname || '-' }}</span>
                 </p>
                 <p class="transition-box-p">
                     <label class="transition-box-label">上传时间：</label>
-                    <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
+                    <span class="transition-box-span">{{ $route.query.item.endTime || '-' }}</span>
                 </p>
                 <p class="transition-box-p">
                     <label class="transition-box-label">征求意见周期：</label>
-                    <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
+                    <span class="transition-box-span" v-if="$route.query.item.startTime && $route.query.item.endTime">{{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}}</span>
                     <span class="transition-box-span" v-else>-</span>
                 </p>
             </div>
@@ -166,6 +166,21 @@
                     }
                 })
             },
+
+          //点击查看
+          handlePreview(data) {
+            console.log(data);
+            return
+            let routeUrl = this.$router.resolve({
+              name: "OtherStandardDetails",
+              params: {
+                id: data.id,
+                pageType: data.standType
+              }
+            });
+            window.open(routeUrl.href, "_blank");
+          },
+
             // 获取详情信息列表
             getList() {
                 this.spinShow = true