diff --git a/src/views/AppMain.vue b/src/views/AppMain.vue index 782fc82..fbbcd6e 100644 --- a/src/views/AppMain.vue +++ b/src/views/AppMain.vue @@ -1,8 +1,9 @@ diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue index 10dadce..cc38e7d 100644 --- a/src/views/equip/detail.vue +++ b/src/views/equip/detail.vue @@ -9,28 +9,20 @@
-
- {{ pageData.modelName }}{{ pageData.deviceName }} -
+
{{ pageData.modelName }}{{ pageData.deviceName }}
{{ pageData.maStatus }}
-
- 已审核 -
+
已审核
浏览{{ pageData.searchNum }}
{{ v.label }}:
-
- {{ - v.key - .split(',') - .map((key) => { - return pageData[key] - }) - .join('') +
{{ + v.key.split(',').map(key => { + return pageData[key] + }).join('') }}
@@ -45,10 +37,10 @@
- + - + {{ isCollect ? '装备已收藏' : '收藏装备' }}
@@ -60,10 +52,12 @@
- +
- +
{{ pageData.companyName }}
@@ -84,10 +78,9 @@
{{ v.label }}:
-
- {{ pageData[v.key] }} +
{{ + pageData[v.key] + }}
@@ -96,7 +89,7 @@
装备外观
- +
@@ -106,35 +99,37 @@
换一批
- +
+ v-model="dialoglease" + title="填写租赁信息" + lock-scroll + class="dialoglease" + width="60%" + > + ref="ruleFormRef" + :model="ruleForm" + :rules="rules" + label-width="120px" + class="demo-ruleForm" + status-icon + > + @@ -145,9 +140,7 @@ - + @@ -155,20 +148,18 @@ + v-model="ruleForm.entryTime" + value-format="YYYY-MM-DD" + type="date" + placeholder="请选择" + /> - + @@ -181,16 +172,24 @@ - + + 否 + - 不需要 - 增值税普票 - 增值税专票 + + 不需要 + + + 增值税普票 + + + 增值税专票 + @@ -198,809 +197,693 @@ - + + :price="pageData.monthLeasePrice" + :name="`${pageData.modelName}${pageData.deviceName}`" + :company="pageData.companyName" + :url="pageData.picUrl" + :brand="pageData.brand" + :code="pageData.code" + :group="pageData.groupName" + :position="pageData.location" + :specifications="pageData.specification" + :type="pageData.typeName" + unit="月" + > - -
+ +
{{ pageData.authPhone }}
diff --git a/src/views/equip/list.vue b/src/views/equip/list.vue index 5f6ced4..0c203b3 100644 --- a/src/views/equip/list.vue +++ b/src/views/equip/list.vue @@ -57,7 +57,7 @@
-
+
+
+ +
-