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

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

@@ -1957,6 +1957,11 @@
         this.checkIsOnly()
       }
     },
+    'form.standName' : {
+      handler: function() {
+        this.checkIsOnly()
+      }
+    },
     'form.standNumber' : {
       handler: function() {
         this.checkIsOnly()
@@ -2129,10 +2134,11 @@
       }
       if (this.form.standInData === '0') {
         standType = 'INLAND'
-        if(this.form.standSort && this.form.standNumber && this.form.standYear){
+        if(this.form.standSort && this.form.standNumber && this.form.standYear && this.form.standName){
           this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
             standType: standType,
             standSort: this.form.standSort,
+            standName: this.form.standName,
             standNumber: this.form.standNumber,
             standYear: this.form.standYear,
           }, {
@@ -2146,10 +2152,11 @@
         }
       } else {
         standType = 'FOREIGN'
-        if(this.form.standSort && this.form.standNumber){
+        if(this.form.standSort && this.form.standNumber && this.form.standName){
           this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
             standType: standType,
             standSort: this.form.standSort,
+            standName: this.form.standName,
             standNumber: this.form.standNumber,
             standYear: this.form.standYear,
           }, {
@@ -2392,13 +2399,13 @@
         // 基础信息
         // standInData:  '0', // 标准来源
         standInData:  this.form.standInData, // 标准来源
-        standSort:  '', // 标准类别
-        country:  '', // 国家
-        standSystem:  '', // 标准体系
-        standNumber: '', // 标准编号
-        standNature: '', // 标准性质
-        standEnName: '', // 英文名称
-        standName: '', // 中文名称
+        standSort:  this.form.standSort, // 标准类别
+        country:  this.form.country, // 国家
+        standSystem:  this.form.standSystem, // 标准体系
+        standNumber: this.form.standNumber, // 标准编号
+        standNature: this.form.standNature, // 标准性质
+        standEnName: this.form.standEnName, // 英文名称
+        standName: this.form.standName, // 中文名称
         signFlag: '1', // 是否需要会签
         textStatus: '', // 文本状态
         standYear: '', // 标准年份
@@ -2492,6 +2499,7 @@
     handleProcessStandardNext(status) {
       this.submitType = status
       switch (status) {
+
         // 新增
         case 1:
           this.gdType = '新增'
@@ -3665,7 +3673,6 @@
 
     },
     handleSubmit() {
-      // this.form.country=this.countryArr;
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.$refs['userForm'].validate((valid) => {
@@ -3680,6 +3687,7 @@
                 this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
                   standType: standType,
                   standSort: this.form.standSort,
+                  standName: this.form.standName,
                   standNumber: this.form.standNumber,
                   standYear: this.form.standYear,
                 }, {

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

@@ -2922,6 +2922,7 @@ export default {
             this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
               standType: standType,
               standSort: this.form.standSort,
+              standName:this.form.standName,
               standNumber: this.form.standNumber,
               standYear: this.form.standYear,
             }, {
@@ -2953,7 +2954,7 @@ export default {
                     this.saveLoading = false
                 })
               } else {
-                this.$message.warning('标准号重复')
+                this.$message.warning(res.message)
                 return
               }
             })

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -286,6 +286,9 @@
         <el-button class="common-button-default" v-btn-permission="'6d0daae8471f16d635bec1529801670a'"
                    size="mini" @click="MobileStandard('2')"><i class="iconfont">&#xe611;</i>移动标准
         </el-button>
+        <el-button class="common-button-default" v-btn-permission="'6d0daae8471f16d635bec1529801670a'"
+                   size="mini" @click="handlemoudel()"><i class="iconfont">&#xe6de;</i>模板下载
+        </el-button>
       </div>
       <!--表格-->
       <div class="content">
@@ -2646,6 +2649,10 @@ export default {
       this.replaceLawsNumForm.pageSize = pageSize
       this.getReplaceLawsNumRow()
     },
+    // 模板下载
+    handlemoudel(){
+      window.open('/api/lawss/sarBussionessStand/exportTemplateFile?fileName=企业标准导入模板')
+    },
     getResetLawsNumRow () {
       this.replaceLawsNumForm = {
         standCode: '', // 标准编号
@@ -4466,7 +4473,7 @@ export default {
     addImportModal(flag) {
       this.importModalshowflag = true
       this.showUploadlist = true
-      this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile'
+      this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?menuId=' + this.selectSarMenu.id + '&userId=' + this.$store.getters.userInfo.userId
     },
     // 二级菜单新建，编辑，删除
     clickDropMenu(name, treeNode) {