Merge remote-tracking branch 'origin/main'

src/components/customField/AddForm.vue

@@ -438,6 +438,13 @@ export default {
               message: res.dbFieldTxt + this.$t('cannotEmpty'),
               trigger: 'blur'
             })
+          } else if (res.fieldShowType === FieldType.DATE_SINGLE.value) {
+            // 解决第一次校验不消失的问题
+            rule.push({
+              required: true,
+              message: res.dbFieldTxt + this.$t('cannotEmpty'),
+              trigger: ['change', 'blur']
+            })
           } else {
             rule.push({
               required: true,
@@ -450,6 +457,7 @@ export default {
           rules[res.dbFieldName] = rule
         }
       })
+      console.log(rules)
       this.rules = rules
       this.isFormInline = true
       this.confirmLoading = false

src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue

@@ -112,7 +112,7 @@
           </template>
 
           <!--   企标编号  -->
-          <template v-slot:standard_no="{text, record}">
+          <template v-slot:standard_number="{text, record}">
             <a-tooltip overlay-class-name="tooltip-style">
               <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
               <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="text || text === 0">{{ text }}</a>
@@ -214,7 +214,7 @@ export default {
       loading: false,
       getTableHeaderFunc: getEnterpriseStandardTableHeader,
       getQueryConditionFunc: getEnterpriseStandardSearchForm,
-      tableSlotField: ['standard_no', 'standard_name'], // 表格中需要插槽的字段
+      tableSlotField: ['standard_number', 'standard_name'], // 表格中需要插槽的字段
       // url传参严格按照当前命名
       url: {
         list: '/laws/standard/enterprise/getCommonPage', // 表格数据
@@ -412,7 +412,7 @@ export default {
         return
       }
       this.collectionFlag = true
-      if (!!record.collectionFlag) {
+      if (record.collectionFlag) {
         const params = {}
         params.id = record.id
         // 说明已收藏，调取消收藏接口
@@ -455,7 +455,7 @@ export default {
     userSelectChange (value) {
       const params = {}
       params.standardId = this.currentShare.id
-      params.standardNum = this.currentShare.standard_no
+      params.standardNumber = this.currentShare.standard_number
       params.recipientId = value
       shareStandard(params).then(res => {
         if (res.success) {