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

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

@@ -1256,7 +1256,7 @@ export default {
         this.listForm.standId = bringData[0].id;
         this.listForm.listName = bringData[0].detailedListName;
         this.listForm.descriptionList = bringData[0].remark;
-        this.listForm.fileId = bringData[0].fileId;
+        this.listForm.fileId = bringData[0].fileIds;
         this.ListModel = false;
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
           { id: bringData[0].id, page: this.page, Size:this.pageSize}, {

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

@@ -289,10 +289,8 @@ export default {
       this.searchSarAccess();
     },
     clearSearch() {
-      this.sarSarAccessEOSearch = {
-        countryArea: "",
-        detailedListName: ""
-      };
+      this.sarSarAccessEOSearch.countryArea = ''
+      this.sarSarAccessEOSearch.detailedListName = ''
       this.searchSarAccess();
     },
     // 新增相关

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

@@ -165,12 +165,11 @@ export default {
       total: 0,
       page: 1,
       rows: 10,
+      pageSize: this.$store.getters.userInfo.configContent,
       // 查询相关参数
       sarSarAccessEOSearch: {
         detailedList: "",
         detailedListName: "",
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
@@ -267,9 +266,9 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
-        ...this.sarSarAccessEOSearch,
         page: 1,
-        pageSize: 10,
+        pageSize: this.pageSize,
+        ...this.sarSarAccessEOSearch,
         sortKey: 3
       }, {
         _this: this
@@ -289,10 +288,8 @@ export default {
       this.searchSarAccess();
     },
     clearSearch() {
-      this.sarSarAccessEOSearch = {
-        detailedList: "",
-        detailedListName: ""
-      };
+      this.sarSarAccessEOSearch.detailedList = ''
+      this.sarSarAccessEOSearch.detailedListName = ''
       this.searchSarAccess();
     },
     // 新增相关

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

@@ -165,13 +165,12 @@ export default {
       searching: false,
       total: 0,
       page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
       rows: 10,
       // 查询相关参数
       sarSarAccessEOSearch: {
         projectName: "",
         detailedListName: "",
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
@@ -268,9 +267,9 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+        page: this.page,
+        pageSize: this.pageSize,
         ...this.sarSarAccessEOSearch,
-        page: 1,
-        pageSize: 10,
         sortKey: 2
       }, {
         _this: this
@@ -291,10 +290,8 @@ export default {
     },
     //清空
     clearSearch() {
-      this.sarSarAccessEOSearch = {
-        projectName: "",
-        detailedListName: "",
-      };
+      this.sarSarAccessEOSearch.projectName = ''
+      this.sarSarAccessEOSearch.detailedListName = ''
       this.searchSarAccess()
 
     },

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

@@ -1376,9 +1376,9 @@ export default {
     // 清单条目 table select事件
     sarAccessInfoSelect (selectData) {
       this.sarAccessInfoListArry = selectData
-      let sarAccessInfoListArryId =  []
+     /* let sarAccessInfoListArryId =  []
       for(let i=0; i<this.selectData.length; i++){
-      }
+      }*/
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1580,7 +1580,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }

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

@@ -57,7 +57,21 @@
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item" prop="responseUnit">
-            <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
+            <el-select
+              class="showBox"
+              v-model="standardForm.zrbm"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in zrbmOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+<!--            <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
             <el-popover placement="bottom" popper-class="user-dept-popper" trigger="click">
               <el-input
                 v-model="standardForm.responseUnit"
@@ -76,7 +90,7 @@
                            class="ztree" style="height: 300px;overflow: auto">
                 </laws-tree>
               </div>
-            </el-popover>
+            </el-popover>-->
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
             <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
@@ -106,7 +120,7 @@
           <el-form  :model="standardForm" class="label-input-form" label-width="108px" inline>
             <el-form-item label="英文名称"  class="search-item">
               <el-input
-                v-model="standardForm.standEnName"
+                v-model="standardForm.standName"
                 placeholder="请输入"
                 :maxlength="100"
                 size="small"
@@ -144,6 +158,22 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="责任部门"  >
+              <el-select
+                class="showBox"
+                v-model="standardForm.zrbm"
+                placeholder="请选择"
+                filterable
+                size="small"
+              >
+                <el-option
+                  v-for="item in zrbmOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item label="适用产品线"  >
               <el-select
                 class="showBox"
@@ -490,11 +520,9 @@ export default {
     },
     // 重置搜索
     resetSelect() {
-      this.standardForm = {
-        standName: "",
-        responseUnit: ""
-      };
-      this.selectInfobyAccid();
+      this.standardForm.standName = ''
+      this.standardForm.responseUnit = ''
+      this.selectInfobyAccid()
     },
     exportStandard() {
       if (this.selectedList.length > 0) {

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

@@ -1392,7 +1392,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')

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

@@ -1390,7 +1390,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')

src/sysConfig/index.js

@@ -7,8 +7,8 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '10.96.170.173'
-const devInterfacePORT = '9999'
+const devIp = '101.36.227.25'
+const devInterfacePORT = '8038'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'