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

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -140,9 +140,7 @@
             v-if="showInfoModal"
         >
           <el-form-item
-              label="标准编号/政策编号"
+              v-show="false"
-              prop="lawCode"
-              class="add-form-item"
           >
             <el-input
                 v-show="false"
@@ -152,6 +150,12 @@
                 v-show="false"
                 v-model.trim="attributeEO.lawId"
             />
+          </el-form-item>
+          <el-form-item
+              label="标准编号/政策编号"
+              prop="lawCode"
+              class="add-form-item"
+          >
             <el-input
                 style="width: 45%"
                 v-model.trim="attributeEO.lawCode"
@@ -720,8 +724,8 @@
             @pageChange="handleSelectPageChange"
             @pageSizeChange="handleSelectPageSizeChange"></pagination>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button class="common-button-default" round icon="el-icon-close" @click="selectModal = false">取消</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
+          <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="selectModal = false">取消</el-button>
         </div>
       </div>
     </el-drawer>
@@ -769,10 +773,10 @@ export default {
       addOrEdit: '',
       attributeEOFormRules: {
         lawCode: [
-          { required: true, message: '标准编号/政策编号不能为空', trigger: 'blur' },
+          { required: true, message: '标准编号/政策编号不能为空', trigger: 'change' },
         ],
         lawName: [
-          { required: true, message: '标准名称/政策名称不能为空', trigger: 'blur' },
+          { required: true, message: '标准名称/政策名称不能为空', trigger: 'change' },
         ],
         productType: [
           { required: true, message: '产品类型不能为空', trigger: 'change' }