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

jero-web/src/views/regulationsKanban/components/addModel.vue

@@ -221,7 +221,7 @@ export default {
       let params = {
         id:this.paramsManifestId,
         dutyTerritory:this.formData.dutyTerritory?this.formData.dutyTerritory:'',
-        projectName:this.formData.projectName,
+        projectName:this.formData.projectName?this.formData.projectName:'',
         projectNameId:this.formData.projectNameId?this.formData.projectNameId:'',
       }
       this.loading = true

jero-web/src/views/regulationsKanban/index.vue

@@ -8,8 +8,8 @@
               <div class="title-text" :title="$t('standard')">
                 <span>{{ $t('standard') }}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                       v-model="queryParam.serialNumber"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -17,8 +17,8 @@
               <div class="title-text" :title="$t('title')">
                 <span>{{$t('title')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model="queryParam.title"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -164,17 +164,20 @@ export default {
         {
           title: this.$t('standard'),
           align: 'center',
-          dataIndex: 'serialNumber'
+          dataIndex: 'serialNumber',
+          width: 180
         },
         {
           title: this.$t('title'),
           align: 'center',
-          dataIndex: 'title'
+          dataIndex: 'title',
+          width: 180
         },
         {
           title: this.$t('status'),
           align: 'center',
-          dataIndex: 'state_dicText'
+          dataIndex: 'state_dicText',
+          width: 180
         },
         // {
         //   title: this.$t('category'),