格然采购价格、其他收款金额

src/views/mallManagement/order/offline_order_list/index.vue

@@ -340,6 +340,11 @@
                 {{ scope.row.partsNum }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="采购价格" prop="costPrice" min-width="120">
+              <template slot-scope="scope">
+                <el-input size="small" type="number" v-model="scope.row.costPrice"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="单价" prop="price" min-width="120">
               <template slot-scope="scope">
                 <el-input size="small" type="number" v-model="scope.row.price"></el-input>
@@ -634,6 +639,7 @@
             <el-table-column align="center" label="内机数量" prop="insideNum" min-width="120"></el-table-column>
             <el-table-column align="center" label="外机数量" prop="outNum" min-width="120"></el-table-column>
             <el-table-column align="center" label="配件数量" prop="partNum" min-width="120"></el-table-column>
+            <el-table-column align="center" label="采购价格" prop="costPrice" min-width="120"></el-table-column>
             <el-table-column align="center" label="单价" prop="price" min-width="120"></el-table-column>
             <el-table-column align="center" label="金额" min-width="120">
               <template slot-scope="scope">
@@ -1080,6 +1086,7 @@ export default {
             }
             if (!this.goodsList[i].num) return this.$errorMsg('请完善商品信息-订单数量')
             if (!this.goodsList[i].price) return this.$errorMsg('请完善商品信息-单价')
+            if (!this.goodsList[i].costPrice) return this.$errorMsg('请完善商品信息-采购价格')
           }
 
           let orderSmallTypeText = this.orderTypeList.find(o => o.id == this.formData.orderSmallType).orderSmallTypeText
@@ -1394,6 +1401,7 @@ export default {
         insideNum: '', // 内机数量
         outNum: '', // 外机数量
         partsNum: '', // 配件数量
+        costPrice: '', // 采购价格
         price: '', // 单价
         amount: '', // 金额
         stockQty: '' // 当前库存

src/views/mallManagement/order/order_detail/index.vue

@@ -427,6 +427,7 @@
             }}</span
           >
           <span style="margin-right: 30px; font-size: 18px">已收款金额：{{ orderDetail.paidAmount }}</span>
+          <span style="margin-right: 30px; font-size: 18px">其他收款金额：{{ orderDetail.otherAmount }}</span>
         </div>
         <el-table
           v-if="orderPaymentRecordListData.length"
@@ -444,6 +445,7 @@
           <el-table-column prop="paidBy" label="收款人" align="center"></el-table-column>
           <el-table-column prop="paidTime" label="收款时间" align="center"></el-table-column>
           <el-table-column prop="paidAmount" label="收款金额" align="center"></el-table-column>
+          <el-table-column prop="otherAmount" label="其他收款金额" align="center"></el-table-column>
           <el-table-column prop="fileUrl" label="收款凭证" align="center">
             <template slot-scope="scope">
               <div>
@@ -493,6 +495,11 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="其他收款金额" prop="otherAmount">
+                  <el-input style="width: 100%" type="number" v-model="ruleForm.otherAmount"></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="24">
                 <el-form-item label="凭证">
                   <ImageUpload :fileList="ruleForm.fileUrls" :limit="100" :isEdit="true" />
@@ -1202,6 +1209,7 @@ export default {
         paidAmount: '',
         paidBy: '',
         paidTime: '',
+        otherAmount: '',
         fileUrls: []
       },
       rules: {
@@ -1278,6 +1286,7 @@ export default {
               paidAmount: '',
               paidBy: '',
               paidTime: '',
+              otherAmount: '',
               fileUrls: []
             }
             this.$successMsg('记录成功')