Merge remote-tracking branch 'origin/master'

jero-web/src/components/tableCollection/index.vue

@@ -31,11 +31,11 @@
                @click='ondataValueTobeinitiated(record)'>{{ record.dataValue == null? '--': record.dataValue}}</span>
            </span>
              <span v-else>
-             <span @click='dataValueTobeinitiated'>{{ record.dataValue }}</span>
+             <span @click='dataValueTobeinitiated(record)'>{{ record.dataValue == null? '--': record.dataValue}}</span>
            </span>
            </span>
            <span v-else>
-             <span @click='dataValueTobeinitiated'>{{ record.dataValue }}</span>
+             <span @click='dataValueTobeinitiated(record)'>{{ record.dataValue == null? '--': record.dataValue}}</span>
            </span>
          </span>
         <span slot="detailClick" slot-scope="text,record">
@@ -70,8 +70,7 @@
       <div class="imports-footer">
         <div class="imports-footer-wrap">
 
-          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit"
-                    v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('preservation')}}
+          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit">{{$t('preservation')}}
           </a-button>
           <a-button class="imports-btn" type="primary" @click="cancleImports">{{$t('cancel')}}</a-button>
         </div>
@@ -337,9 +336,10 @@
       },
       getLoginUserType() {
         let params = {
-          paramsManifestId: this.paramsManifest.id,
-          projectId: this.$route.query.id
+          paramsManifestId: this.$route.query.id,
+          projectId: this.$route.query.projectId
         }
+        console.log(params,'pppp')
         getAction(this.url.getLoginUserType, params).then((res) => {
           if (res.success) {
             this.getTableList()
@@ -352,7 +352,7 @@
         let url
         if (this.$route.query.it === undefined) {
           // 页面跳转
-          paramsManifestid = this.paramsManifest.id
+          paramsManifestid = this.$route.query.id
           url = this.url.tableHeader
         } else {
           // 历史版本
@@ -415,7 +415,7 @@
       },
       getTableListReset() {
         let params = {
-          paramsManifestId: this.paramsManifest.id,
+          paramsManifestId: this.$route.query.id,
           userTypes: this.currentPersonRole
         }
         this.loading = true
@@ -438,7 +438,7 @@
         let url
         if (this.$route.query.it === undefined) {
           // 页面跳转
-          paramsManifestid = this.paramsManifest.id
+          paramsManifestid = this.$route.query.id
           url = this.url.tableList
         } else {
           console.log('历史版本呢')

jero-web/src/views/documentTools/virtualList/index.vue

@@ -33,7 +33,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="setCreatorClick" class="operator-text" v-has="'dummyInventoryBase:add'">
+      <div @click="setCreatorClick" class="operator-text" v-has="'virtual:set:creater'">
         <a-icon type="setting"/>
         {{$t('setCreator')}}
       </div>

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -363,7 +363,7 @@ export default {
           { required: true, message: this.$t('pleaseSelect')+this.$t('Required'), trigger: 'change' },
         ],
         paramsName: [
-          { required: true, message: this.$t('pleaseSelect')+this.$t('Required'), trigger: 'change' },
+          { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'change' },
           { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' },
         ],
         technologyTerritory: [
@@ -550,7 +550,7 @@ export default {
       this.contentList.forEach((item,index) => {
         let reg = /^[0-9a-zA-Z-]{1,}$/
         // 编号的限制
-        if(item.paramsNumber == '') {
+        if(item.paramsNumber == '' || item.paramsNumber === undefined) {
           this.$message.warning(this.$t('standard')+this.$t('cannotEmpty'))
           falg = 0
           return
@@ -564,7 +564,7 @@ export default {
           return
         }
         // 参数名称的限制
-        if(item.paramsName == '') {
+        if(item.paramsName == '' || item.paramsName === undefined) {
           this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty'))
           falg = 0
           return

jero-web/src/views/projectManagement/components/TaskParameterCollection.vue

@@ -206,7 +206,7 @@
         localStorage.setItem('paramsManifest', JSON.stringify(item))
         let newUrl = this.$router.resolve({
           path: '/ParameterItemCollection',
-          query: this.$route.query
+          query: item,
         })
         window.open(newUrl.href, '_blank')
       },