Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!125

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue

@@ -354,9 +354,13 @@ export default {
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
+          this.projectId = item.projectId
+          this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
+          this.projectId = item.form.projectId
+          this.getStandData();
         }
       });
     },

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

@@ -478,7 +478,7 @@
                                        :editable="false"
                                        placeholder="请选择发布日期"></el-datePicker>
                     </el-form-item>
-                    <el-form-item label="标准实施日期" prop="putTime" label-width="150px" class="add-form-item">
+                    <el-form-item label="企标实施日期" prop="putTime" label-width="150px" class="add-form-item">
                         <el-datePicker v-model="sarBussionessStandEO.putTime"
                                        :editable="false"
                                        placeholder="请选择实施日期"
@@ -964,7 +964,7 @@
                                                  value-format="yyyy-MM-dd"
                                                  clearable></el-datePicker>
                               </el-form-item>
-                              <el-form-item label="实施日期" title="标准实施日期" class="add-form-item form-item-disabled">
+                              <el-form-item label="实施日期" title="企标实施日期" class="add-form-item form-item-disabled">
                                   <el-datePicker v-model="sarBussionessSearch.putTime"
                                                  :editable="false"
                                                  placeholder="请选择实施日期"
@@ -1622,9 +1622,15 @@ export default {
       applyCountryOptions: [], // 国家/地区下拉框
       formdisableflag: false,
       defaultAddFormFieldRules: {
-        // standSort: [
+        textStatusBuss:[
-        //   {required: true, message: '企标类别不能为空', trigger: 'change'}
+          {required: true, message: '文本状态不能为空', trigger: 'change'}
-        // ],
+        ],
+        standYear:[
+            {required: true, message: '标准年份不能为空', trigger: 'change'}
+        ],
+        standSort: [
+          {required: true, message: '企标类别不能为空', trigger: 'change'}
+        ],
         standCode: [
           {required: true, type: 'string', message: '企标编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '企标编号不能超过100个字符', trigger: 'change'}
@@ -1634,7 +1640,7 @@ export default {
           {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
         ],
         standEnName: [
-          {required: true, message: '英文名称不能为空', trigger: 'change'},
+          {required: false, message: '英文名称不能为空', trigger: 'change'},
           {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'},
           {validator: this.verify.valiateEnName, trigger: 'change'}
         ],
@@ -1642,10 +1648,10 @@ export default {
           {required: true, message: '标准状态不能为空', trigger: 'change'}
         ],
         issueTime: [
-          {required: true, message: '发布日期不能为空', trigger: 'change'}
+          {required: false, message: '发布日期不能为空', trigger: 'change'}
         ],
         putTime: [
-          {required: true, message: '标准实施日期不能为空', trigger: 'change'}
+          {required: false, message: '企标实施日期不能为空', trigger: 'change'}
         ],
         replaceStandNum: [
           {type: 'string', max: 100, message: '代替企标编号不能超过100个字符', trigger: 'change'}
@@ -2122,7 +2128,6 @@ export default {
       },
       // 树节点鼠标移入移出
       mouseenter(data){
-          console.log(data)
           this.$set(data, 'show', true)
           if(data.parentId !== null){
               this.$set(data, 'showDel', true)
@@ -2731,6 +2736,7 @@ export default {
             if (flag) {
               // 时间格式修改
               let nowstandinfo = JSON.parse(JSON.stringify(this.sarBussionessStandEO))
+              console.log(nowstandinfo)
               if (nowstandinfo.issueTime != null && nowstandinfo.issueTime !== '') {
                 nowstandinfo.issueTime = this.$dateFormat(this.sarBussionessStandEO.issueTime, 'yyyy-MM-dd hh:mm:ss')
               }
@@ -2747,6 +2753,7 @@ export default {
               }
               // 处理动态表单的时间和下拉框格式
               const formFieldList = this.formFieldList
+              console.log(this.formFieldList)
               const sarStandAttrObj = {}
               formFieldList.forEach((item) => {
                 const value = nowstandinfo[item.attrField]
@@ -3276,6 +3283,28 @@ export default {
       this.tableFlag = item
       // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
       this.getBussionStandTable(item,'',type)
+
+
+      this.sarBussionessSearch.applyCountry = ''
+      this.sarBussionessSearch.standGenera = ''
+      this.sarBussionessSearch.standSubclass = ''
+      this.sarBussionessSearch.issueTime = ''
+      this.sarBussionessSearch.putTime = ''
+      this.sarBussionessSearch.responsibleUnit = ''
+      this.sarBussionessSearch.classifyCode = ''
+      this.sarBussionessSearch.standCode = ''
+      this.sarBussionessSearch.standName = ''
+      this.sarBussionessSearch.numberName = ''
+      this.sarBussionessSearch.standSort = ''
+      this.sarBussionessSearch.replaceStandNum = ''
+      this.sarBussionessSearch.orgName = ''
+      this.sarBussionessSearch.id = ''
+      this.sarBussionessSearch.synopsis = ''
+      this.sarBussionessSearch.classifyCode = ''
+      this.sarBussionessSearch.quoteStand = ''
+      this.sarBussionessSearch.standStatus = ''
+      this.sarBussionessSearch.citationUser = ''
+      this.sarBussionessSearch.advanceSearchVOStr = ''
     },
     // 清空搜索框
     clearAllSearch (flag) {
@@ -3617,6 +3646,7 @@ export default {
         }, {
           _this: this
         }, res => {
+          console.log('getAreaList',res.data)
           this.showRegionOptions = res.data || []
           resolve(res.data || [])
         }, e => {
@@ -3869,8 +3899,22 @@ export default {
           handler: function() {
               if(this.sarBussionessStandEO.issueTime !== undefined && this.sarBussionessStandEO.issueTime !== null && this.sarBussionessStandEO.issueTime !== ''){
                   let date = new Date(this.$moment(this.sarBussionessStandEO.issueTime).format('YYYY-MM-DD'))
-                  const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
+                  // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
-                  this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
+                  // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
+
+                let year = date.getFullYear()+5;
+                let month =(date.getMonth() + 1).toString();
+                let day = (date.getDate()).toString();
+                if (month.length == 1) {
+                  month = "0" + month;
+                }
+                if (day.length == 1) {
+                  day = "0" + day;
+                }
+                const FSRQBUSS = year + "-" + month + "-" + day;
+                console.log(FSRQBUSS,"FSRQBUSS");
+                this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
+
               }
           },
       },

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -739,7 +739,7 @@
                              clearable>
                     <el-option
                             v-for="opt in standStateOptions"
-                            :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑国内标准'"
+                            :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑海外标准'"
                             :key="opt.value"
                             :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                     >
@@ -1935,7 +1935,7 @@ export default {
           {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
           // {validator: this.verify.valiateEnName, trigger: 'blur'}
         ],
-        standState: [
+        textStatus: [
          {required: true, message: '文本状态不能为空', trigger: 'change'}
          ],
         replaceStandNum: [