对接法规月报

jero-web/src/common/lang/en-us.js

@@ -1054,4 +1054,5 @@ module.exports = {
   Copyparameterlist: 'Copy parameter list',
   Templatenamelist: 'Template name - parameter item collection list',
   newNiONumber: 'Number',
+  English: 'English'
 }

jero-web/src/common/lang/zh-cn.js

@@ -1058,4 +1058,5 @@ module.exports = {
   Copyparameterlist: '复制参数清单',
   Templatenamelist: '模板名称-参数项收集清单',
   newNiONumber: 'NIO编号',
+  English:'英文',
 }

jero-web/src/components/uploadFile/file.vue

@@ -8,7 +8,7 @@
         :class="{'uploadFile':isUploadFile}"
         name="file"
         :file-list="myfileList"
-        :multiple="true"
+        :multiple="multiple"
         :action="uploadAction+'?state='+state+'&cut='+cut"
         :headers="headers"
         @preview="preview"
@@ -33,7 +33,7 @@
 
   export default {
     name: 'file',
-    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile'],
+    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple'],
     data() {
       return {
         visible: false,
@@ -46,7 +46,8 @@
         fileList: [],
         myfileList: [],
         isLoding: false,
-        cut: ''
+        cut: '',
+        multiple: true
       }
     },
     created() {
@@ -62,6 +63,9 @@
       } else if (long && long == 'en-us') {
         this.cut = 'en'
       }
+      if (this.isMultiple) {
+        this.multiple = false
+      }
       // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
     },
     methods: {
@@ -76,11 +80,15 @@
           this.myfileList = []
         }
       },
-      beforeUpload(file) {
+      beforeUpload(file, fileList) {
-
-        console.log(file)
         // let thisFileType = this.thisFileType.replace(/\s+/g, "");
         this.fileTypeSatus = true
+        if (this.isMultiple) {
+          if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) {
+            this.$message.warning('只能上传一个文件')
+            return false
+          }
+        }
         //TODO 客户要求不拦截文件
         // if(file.type){
         //   if (thisFileType.indexOf(file.type) != -1) {

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -9,7 +9,7 @@
                 <span>{{$t('RegulationMonthlyName')}}</span>
               </div>
               <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RegulationMonthlyName')"
-                       v-model="queryParam.RegulationMonthlyName"></j-input>
+                       v-model="queryParam.name"></j-input>
             </div>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -46,7 +46,7 @@
           <span slot="operation" slot-scope="text,record">
            <a class="text-operation"
               @click="withdraw(record)">
-             {{record.state == 2 ? $t('release') : $t('withdraw')}}
+             {{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
            </a>
            <a class="text-operation"
               @click="deleteLib(record)">{{$t('deleteLib')}}</a>
@@ -82,9 +82,9 @@
       return {
         //url传参严格按照当前命名
         url: {
-          list: '',
+          list: '/report/lawsMonthlyReportManageEO/page',
-          urlWithdraw: '',
+          urlWithdraw: '/report/lawsMonthlyReportManageEO/issue',
-          deleteBatch: ''
+          deleteBatch: '/report/lawsMonthlyReportManageEO/deleteBatch'
         },
         loading: false,
         dataSource: [],
@@ -111,7 +111,7 @@
             align: 'center',
             width: 140,
             ellipsis: true,
-            dataIndex: 'releaseStatus'
+            dataIndex: 'issueStatus'
           },
           {
             title: this.$t('uploadTime'),
@@ -210,17 +210,17 @@
         }
       },
       managementAddForm() {
-        this.getList()
+        this.pageOnChange(1)
       },
       //撤回
       withdraw(val) {
         let item = {}
         let content = ''
-        if (val.state == 2) {
+        if (val.issueStatus == 2) {
           content = this.$t('confirmRelease')
-          item.state = 1
+          item.issueStatus = 1
         } else {
-          item.state = 2
+          item.issueStatus = 2
           content = this.$t('confirmWithdraw')
         }
         item.id = val.id

jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue

@@ -19,11 +19,11 @@
                   <span class="title-text-text"
                         :title="$t('monthlyReportRegulations')">{{$t('monthlyReportRegulations')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" :prop="'RegulationMonthlyName'">
+                <a-form-model-item class="itemModel" :prop="'name'">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('RegulationMonthlyName')">
+                            @click="clickButtonToUpload('name')">
-                    {{ (formInline['RegulationMonthlyName'] === 'null' || formInline['RegulationMonthlyName'] === '' ||
+                    {{ (formInline['name'] === 'null' || formInline['name'] === '' ||
-                    formInline['RegulationMonthlyName'] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    formInline['name'] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                 </a-form-model-item>
@@ -36,9 +36,20 @@
                   <span class="title-text-text" :title="$t('monthlyLanguage')">{{$t('monthlyLanguage')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="useExplain">
-                  <a-textarea
+                  <a-select :placeholder="$t('PleaseSelect')+$t('monthlyLanguage')"
-                    :placeholder="$t('PleaseEnter')+$t('instructionForUse')"
+                            :disabled="disabled"
-                    v-model.trim="formInline.useExplain" :rows="4"/>
+                            class="box-input"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            allowClear
+                            v-model="formInline.language">
+                    <a-select-option v-for="(item, key) in languageList"
+                                     :key="item.value"
+                                     :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title="item.text ">
+                           {{ item.text }}
+                     </span>
+                    </a-select-option>
+                  </a-select>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -50,7 +61,7 @@
         <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
       </div>
     </a-drawer>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
+    <uploadFile ref="uploadFile" :isMultiple="true" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
@@ -69,32 +80,33 @@
           name: [
             {
               required: true,
-              message: this.$t('VirtualListName') + this.$t('cannotEmpty'),
+              message: this.$t('monthlyReportRegulations') + this.$t('cannotEmpty'),
-              trigger: 'blur'
+              trigger: 'change'
-            },
-            {
-              max: 100,
-              message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
-              trigger: 'blur'
             }
           ],
-          useExplain: [
+          language: [
             {
               required: true,
-              message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
+              message: this.$t('monthlyLanguage') + this.$t('cannotEmpty'),
-              trigger: 'blur'
+              trigger: 'change'
-            },
-            {
-              max: 500,
-              message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
-              trigger: 'blur'
             }
           ]
         },
         visible: false,
+        languageList: [
+          {
+            text: this.$t('chinese'),
+            value: 1
+          },
+          {
+            text: this.$t('English'),
+            value: 2
+          }
+        ],
         formInline: {},
         confirmLoading: false,
-        uploadName: ''
+        uploadName: '',
+        disabled: false
       }
     },
     methods: {
@@ -104,7 +116,18 @@
       handleSubmit() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-
+            this.confirmLoading = true
+            postAction('/report/lawsMonthlyReportManageEO/add', this.formInline).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+                this.$emit('managementAddForm')
+              } else {
+                this.confirmLoading = false
+                this.$message.warning(this.$t('operationFailed'))
+              }
+            })
           }
         })
       },