Merge branch 'dev-wangyiming'

src/components/equipDetailTable.vue

@@ -29,7 +29,7 @@
         </el-table-column>
         <el-table-column prop="name" label="租金" min-width="80" >
             <template #default="scope">
-                {{ scope.row.price }}{{ scope.row.unit }}
+                {{ scope.row.price }}/{{ scope.row.unit }}
             </template>
         </el-table-column>
         <el-table-column prop="company" label="供应商" min-width="120" />

src/views/equip/detail.vue

@@ -12,7 +12,7 @@
                             <div class="name">{{ pageData.modelName }}{{ pageData.deviceName }}</div>
                             <div class="tag">
                                 <div class="item">{{ pageData.maStatusStr }}</div>
-                                <div class="item otherItem" v-if="pageData.isAudit == 1">已审核</div>
+                                <div class="item otherItem">已审核</div>
                             </div>
                         </div>
                         <div class="viewNnum">浏览{{ pageData.searchNum }}</div>
@@ -105,7 +105,7 @@
                             :key="i"
                             :url="v.picUrl"
                             :name="`${v.modelName}${v.deviceName}`"
-                            :tags="[v.maStatus,v.location]"
+                            :tags="[v.maStatusStr,v.cityStr]"
                             :company="v.companyName"
                             :price="v.monthLeasePrice"
                             timeUnit="月"
@@ -211,7 +211,7 @@
                 </el-form>
             </el-config-provider>
             <equipDetailTable
-                    :price="`${priceChange}元`"
+                    :price="`${ruleForm.durationUnit == '1' ? pageData.monthLeasePrice : pageData.dayLeasePrice }`"
                     :name="`${pageData.modelName}${pageData.deviceName}`"
                     :company="pageData.companyName"
                     :url="pageData.picUrl"
@@ -221,8 +221,11 @@
                     :position="pageData.location"
                     :specifications="pageData.specification"
                     :type="pageData.typeName"
-                    unit=""
+                    :unit="ruleForm.durationUnit == '1' ? '月' : '天'"
             ></equipDetailTable>
+            <div class="countPrice">
+                合计总价：<span>{{ priceChange }}元</span>
+            </div>
             <template #footer>
                   <span class="dialog-footer">
                     <el-button type="primary" @click="submit">
@@ -330,7 +333,7 @@ const equipDetailKeyList = reactive([
         arg: ''
     },
     {
-        label: '规格/操作重量',
+        label: '规格',
         key: 'specification',
         fn: '',
         arg: ''
@@ -608,7 +611,8 @@ const submit = async () => {
         invoiceType: ruleForm.value.invoiceType,
         description: ruleForm.value.projectDescription,
         durationType: ruleForm.value.durationUnit,
-        cost: priceChange.value
+        cost: priceChange.value,
+        maId: pageData.value.maId
     }
 
     const res = await apiSubmitLease(params)
@@ -644,6 +648,16 @@ init()
   }
 }
 
+.countPrice {
+  padding: 10px;
+  text-align: right;
+
+  span {
+    color: red;
+    font-weight: 600;
+  }
+}
+
 .equipDetail {
   user-select: none;
   margin-top: 20px;
@@ -922,14 +936,19 @@ init()
 
         .label {
           color: #8e8e8e;
+          width: 100px;
         }
 
         .value {
           color: #333333;
+          flex: 1;
+          word-break: break-all;
+          font-family: 'fangsong';
         }
 
         .fnValue {
           color: #0087cd;
+          font-family: 'fangsong';
         }
       }
     }

src/views/home/index.vue

@@ -329,13 +329,13 @@
         }
 
         .equip-pic {
-            height: 160px;
             display: flex;
-            justify-content: space-between;
             align-items: center;
-
             li {
-                width: 340px;
+                width: calc((100% - 30px) / 3);
+                &:nth-child(2n){
+                    margin: 0 15px;
+                }
             }
         }