v1.0.2 改版bug修复

src/views/goods/components/price-edit.vue

@@ -34,24 +34,11 @@
             <template slot-scope="{row}">
               <span>{{ row.minBuyNumber }}</span>
             </template>
-            <!-- <template slot-scope="{row}">
-              <el-input v-model="row.minBuyNumber" disabled="true" @input="e => (row.name= checkedInput(e))" />
-            </template> -->
           </el-table-column>
-          <!-- <el-table-column label="成本价" prop="name" align="center">
-            <template slot-scope="{row}">
-              <span> ¥{{ row.costPrice | toThousandFloatFilter }}</span>
-            </template>
-          </el-table-column> -->
           <el-table-column label="售价" prop="name" align="center">
             <template slot-scope="{row}">
               <span> ¥{{ row.price | toThousandFloatFilter }}</span>
             </template>
-            <!-- <template slot-scope="{row}">
-              <el-input v-model="row.price" disabled="true" @input="e => (row.price= checkedInput(e))">
-                <template slot="prepend">¥</template>
-              </el-input>
-            </template> -->
           </el-table-column>
         </el-table>
       </el-form-item>

src/views/order/detail.vue

@@ -231,13 +231,13 @@
             <el-col
               :span="6"
             ><b>待收金额：</b> ¥{{
-              shopOrder.waitPayShop | toThousandFloatFilter
+              shopOrder.restAmount | toThousandFloatFilter
             }}</el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
             <el-col
               :span="6"
-            ><b>订单状态：</b>
+            ><b>子订单状态：</b>
               <template v-if="shopOrder.shopStatus < 10">
                 <el-tag type="success" size="small">
                   {{ orderStatus(shopOrder.shopStatus) }}
@@ -254,17 +254,17 @@
                 v-if="shopOrder.receiptStatus * 1 === 1"
                 type="danger"
                 size="small"
-              >待付款</el-tag>
+              >待收款</el-tag>
               <el-tag
                 v-if="shopOrder.receiptStatus * 1 === 2"
                 type="warning"
                 size="small"
-              >部分付款</el-tag>
+              >部分收款</el-tag>
               <el-tag
                 v-if="shopOrder.receiptStatus * 1 === 3"
                 type="success"
                 size="small"
-              >已付款</el-tag>
+              >已收款</el-tag>
             </el-col>
             <el-col
               :span="6"
@@ -392,6 +392,24 @@
               </el-table-column>
             </el-table>
           </el-row>
+          <div v-if="shopOrder.vouchers.length > 0">
+            <h1 style="font-size: 14px; color: #409eff">线下支付凭证：</h1>
+            <el-row v-for="(vouch, index) in shopOrder.vouchers" :key="index" style="padding: 5px 0">
+              <p class="refund-item-p">{{ vouch.addTime }}</p>
+              <div class="refund-item-imgs">
+                <div
+                  v-for="(imgage, imgIndex) in vouch.images"
+                  :key="imgIndex"
+                  class="item-image"
+                >
+                  <a :href="imgage" target="_blank" rel="noopener noreferrer">
+                    <img :src="imgage" alt="">
+                  </a>
+                </div>
+              </div>
+              <p v-if="vouch.remarks" class="refund-item-p">备注：{{ vouch.remarks }}</p>
+            </el-row>
+          </div>
         </div>
       </div>
       <div class="refund-item">
@@ -407,19 +425,21 @@
             ><b>发票抬头：</b>
               {{ orderInvoice.invoiceTitle ? orderInvoice.invoiceTitle : "无" }}</el-col>
             <el-col
+              v-if="orderInvoice.invoiceTitleType*1 === 1"
               :span="6"
             ><b>单位税号：</b>
               {{
                 orderInvoice.corporationTaxNum ? orderInvoice.corporationTaxNum : "无"
               }}</el-col>
             <el-col
+              v-if="orderInvoice.invoiceTitleType*1 === 1"
               :span="8"
             ><b>注册地址：</b>
               {{
                 orderInvoice.registeredAddress ? orderInvoice.registeredAddress : "无"
               }}</el-col>
           </el-row>
-          <el-row :gutter="24" class="box-row">
+          <el-row v-if="orderInvoice.invoiceTitleType*1 === 1" :gutter="24" class="box-row">
             <el-col
               :span="6"
             ><b>注册电话：</b>
@@ -442,24 +462,7 @@
           </el-row>
         </template>
       </div>
-      <div v-if="voucher.length > 0" class="refund-item">
-        <h1 style="font-size: 14px; color: #409eff">线下支付凭证：</h1>
-        <el-row v-for="(vouch, index) in voucher" :key="index" style="padding: 5px 0">
-          <p class="refund-item-p">{{ vouch.addTime }}</p>
-          <div class="refund-item-imgs">
-            <div
-              v-for="(imgage, imgIndex) in vouch.images"
-              :key="imgIndex"
-              class="item-image"
-            >
-              <a :href="imgage" target="_blank" rel="noopener noreferrer">
-                <img :src="imgage" alt="">
-              </a>
-            </div>
-          </div>
-          <p v-if="vouch.remarks" class="refund-item-p">备注：{{ vouch.remarks }}</p>
-        </el-row>
-      </div>
+      <!-- <div v-if="voucher.length > 0" class="refund-item"></div> -->
       <el-dialog title="更改收款状态" :visible.sync="dialogFormVisible" width="600px">
         <el-form
           ref="dataForm"

src/views/order/order-remarks.vue

@@ -2,13 +2,14 @@
   <div class="app-container">
     <div v-if="orderNoteList.length === 0" class="order_empty">
       <span>暂无订单备注</span>
-      <!-- <el-button type="primary" @click="handlePayNote">添加备注</el-button> -->
     </div>
     <div v-else>
-      <!-- <div class="filter-container" style="text-align: right; padding: 0;">
-        <el-button type="primary" @click="handlePayNote">添加备注</el-button>
-      </div> -->
-      <el-card v-for="item in orderNoteList" :key="item.id" class="box-card" style="margin: 0 auto;">
+      <el-card
+        v-for="item in orderNoteList"
+        :key="item.id"
+        class="box-card"
+        style="margin: 0 auto"
+      >
         <div class="refund-item">
           <el-form label-width="120px">
             <el-form-item :label="item.createName">
@@ -20,13 +21,27 @@
               {{ item.remarks }}
             </el-form-item>
             <el-form-item label="图片：">
-              <el-image v-for="(img, index) in item.images" :key="index" :preview-src-list="[img]" style="width: 148px;height: 148px;margin-right: 20px;" :src="img" />
+              <template v-if="item.images.length > 0">
+                <el-image
+                  v-for="(img, index) in item.images"
+                  :key="index"
+                  :preview-src-list="[img]"
+                  style="width: 148px; height: 148px; margin-right: 20px"
+                  :src="img"
+                />
+              </template>
+              <template v-else>
+                无
+              </template>
             </el-form-item>
             <el-form-item label="文件：">
-              <div v-for="file, i in item.ossFiles" :key="i">
-                <span class="order_text">{{ file.name }}</span>
-                <el-button type="text" @click="handlerDownload(file)">下载</el-button>
-              </div>
+              <template v-if="item.ossFiles.length > 0">
+                <div v-for="(file, i) in item.ossFiles" :key="i">
+                  <span class="order_text">{{ file.name }}</span>
+                  <el-button type="text" @click="handlerDownload(file)">下载</el-button>
+                </div>
+              </template>
+              <template v-else> 无 </template>
             </el-form-item>
           </el-form>
         </div>
@@ -42,8 +57,7 @@
 import { orderNotes, fileDownload } from '@/api/order'
 export default {
   name: 'OrderRemarks',
-  filters: {
-  },
+  filters: {},
   data() {
     return {
       orderInfo: {},
@@ -120,7 +134,7 @@ export default {
   flex-direction: column;
 }
 .order_empty span {
-  color: #409EFF;
+  color: #409eff;
   margin: 1vw;
 }
 .order_time {
@@ -147,48 +161,47 @@ export default {
 ::v-deep .el-card {
   margin: 20px auto !important;
 }
-  .app-title{
-    line-height: 36px;
-    font-size: 26px;
-    font-weight: bold;
-    color: #409EFF;
-    text-align: center;
-    margin: 0;
-  }
-  .box-card{
-    font-size: 14px;
-  }
-  .box-row{
-    padding: 10px 0;
-  }
-  .box-row .dropdown{
-    margin-top: -10px;
-  }
-  .refund-item{
-    padding: 10px 0;
-  }
-  .order-item{
-    background:#f7f7f7;
-    margin-bottom: 20px;
-    padding: 10px 15px;
-    border-radius: 5px;
-  }
-  .product-row{
-    padding: 10px 0;
-    background: #EBEEF5;
-    border-top: 1px dashed #DCDFE6;
-  }
-  .op-item{
-    padding: 5px 0;
-  }
-  .el-span-warning{
-    color: #E6A23C;
-  }
-  .el-span-success{
-    color: #67C23A;
-  }
-  .el-span-danger{
-    color: #F56C6C;
-  }
+.app-title {
+  line-height: 36px;
+  font-size: 26px;
+  font-weight: bold;
+  color: #409eff;
+  text-align: center;
+  margin: 0;
+}
+.box-card {
+  font-size: 14px;
+}
+.box-row {
+  padding: 10px 0;
+}
+.box-row .dropdown {
+  margin-top: -10px;
+}
+.refund-item {
+  padding: 10px 0;
+}
+.order-item {
+  background: #f7f7f7;
+  margin-bottom: 20px;
+  padding: 10px 15px;
+  border-radius: 5px;
+}
+.product-row {
+  padding: 10px 0;
+  background: #ebeef5;
+  border-top: 1px dashed #dcdfe6;
+}
+.op-item {
+  padding: 5px 0;
+}
+.el-span-warning {
+  color: #e6a23c;
+}
+.el-span-success {
+  color: #67c23a;
+}
+.el-span-danger {
+  color: #f56c6c;
+}
 </style>
-