diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue index a9f6f123d..b50ead6cd 100644 --- a/src/components/CustomFormComponents/InputForAllStandards2.vue +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -164,6 +164,9 @@ labelWidth: { type: String, default: '150px' + }, + placeholderText: { + type: String } }, data () { @@ -193,7 +196,7 @@ }, computed: { placeholder () { - return `请输入${this.config.attrName}` + return `${this.placeholderText}` }, showMessage () { return `${this.config.attrName}不能为空` diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 85e0aecc1..d854e24e8 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -15,10 +15,10 @@

- -

标准分解单 @@ -607,12 +622,12 @@
{{ !child.value || child.value === 'null' ? '-' : child.value }} {{ child.value || '-' }}

标准分解单 @@ -709,12 +728,6 @@
-
-
- {{ item.showAll ? '收起' : '更多' }} - -
-
@@ -725,12 +738,12 @@
@@ -739,10 +752,10 @@ @@ -756,10 +769,10 @@
+ v-model="standItemSearch.XCXSSRQ" + type="date" + value-format="yyyy-MM-dd" + placeholder="新车实施日期">
@@ -767,28 +780,28 @@
+ v-model="standItemSearch.ZCCSSRQ" + type="date" + value-format="yyyy-MM-dd" + placeholder="在产车实施日期">
+ :loading="searching" + type="primary" + size="mini" + class="common-button-primary" + @click="searchSarStandItems"> 查询 + class="common-button-default" + @click="clearAllSearch" + size="mini"> 清空 @@ -802,60 +815,61 @@ 导出 关联条款 编辑 + size="mini" + type="primary" + class="common-button-primary" + @click="editResolveList" + >编辑 +
+ @select="select" + @selection-change="selectAllStand"> + show-overflow-tooltip + prop="comparedWithPrevious" + label="基于上一版本差异" + width="170"> + prop="xccssrq" + label="新车型实施日期(文本)" + width="180"> + prop="zccssrq" + label="在产车实施日期(文本)" + width="170"> - - - - + + + + + prop="dutyEngineer" + label="责任工程师" + width="100"> + show-overflow-tooltip + label="符合性状态" + width="100"> + show-overflow-tooltip + prop="complianceState" + label="合规性分析" + width="100">