From ba2f86d196830e3e0ce02a3c09d28ac2f788e118 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 2 Aug 2024 15:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sales/salesOrder/salesOrderAdd.vue  |  40 +++----
 src/views/sales/salesOrder/salesOrderInfo.vue | 104 +++++++++++-------
 2 files changed, 86 insertions(+), 58 deletions(-)

diff --git a/src/views/sales/salesOrder/salesOrderAdd.vue b/src/views/sales/salesOrder/salesOrderAdd.vue
index 4992f30..d3705ea 100644
--- a/src/views/sales/salesOrder/salesOrderAdd.vue
+++ b/src/views/sales/salesOrder/salesOrderAdd.vue
@@ -151,24 +151,24 @@
                 <el-button type="danger" size="small" @click="commodityDelete(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="goodsSpuName" label="商品名称" width="150" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
-            <el-table-column prop="unit" label="单位" width="100" align="center" />
-            <el-table-column prop="count" label="数量" width="150" align="center">
+            <el-table-column prop="goodsSpuName" label="商品名称"  align="center" min-width="200" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" min-width="200" />
+            <el-table-column prop="unit" label="单位" align="center" width="100" />
+            <el-table-column prop="count" label="数量" align="center" min-width="150">
               <template slot-scope="scope">
                 <el-input @input="dueAmountInput(scope.row)" @keyup.native="scope.row.count = getNumber(scope.row.count, 0)" v-model="scope.row.count" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column prop="batchNumber" label="批次号" width="100" align="center" />
-            <el-table-column prop="price" label="单价" width="100" align="center" />
-            <el-table-column label="税率(%)" width="150" align="center">
+            <el-table-column prop="batchNumber" label="批次号" align="center" min-width="150" />
+            <el-table-column prop="price" label="单价" align="center" min-width="150" />
+            <el-table-column label="税率(%)" align="center" min-width="150">
               <template slot-scope="scope">
                 <el-input @input="taxAmountInput(scope.row)" @keyup.native="scope.row.taxRate = getNumber(scope.row.taxRate, 2)" v-model="scope.row.taxRate" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column prop="taxAmount" label="税额" width="150" align="center" />
-            <el-table-column prop="dueAmount" label="应收款" width="100" align="center" />
-            <el-table-column prop="cost" label="商品成本" width="150" align="center">
+            <el-table-column prop="taxAmount" label="税额" align="center" min-width="150" />
+            <el-table-column prop="dueAmount" label="应收款" align="center" min-width="150" />
+            <el-table-column prop="cost" label="商品成本" align="center" min-width="150">
               <template slot-scope="scope">
                 <el-input @keyup.native="scope.row.cost = getNumber(scope.row.cost, 2)" v-model="scope.row.cost" clearable placeholder="" />
               </template>
@@ -178,23 +178,23 @@
                 <el-input v-model="scope.row.remarks" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
-            <el-table-column label="折扣率(%)" width="150" align="center">
+            <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" min-width="150" />
+            <el-table-column label="折扣率(%)" align="center" min-width="150">
               <template slot-scope="scope">
                 <el-input @input="discountPriceInput(scope.row)" @keyup.native="scope.row.discountRtate = getNumber(scope.row.discountRtate, 2)" v-model="scope.row.discountRtate" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="辅单位数量" width="150" align="center">
+            <el-table-column label="辅单位数量" align="center" min-width="150">
               <template slot-scope="scope">
                 <el-input @keyup.native="scope.row.auxiliaryUnit = getNumber(scope.row.auxiliaryUnit, 2)" v-model="scope.row.auxiliaryUnit" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column prop="discountPrice" label="折后单价" width="100" align="center" />
-            <el-table-column prop="discountAmount" label="分摊优惠" width="100" align="center" />
-            <el-table-column prop="amount" label="惠后金额" width="100" align="center" />
-            <el-table-column prop="weight" label="重量" width="100" align="center" />
-            <el-table-column prop="taxTotalAmount" label="未含税总额" width="150" align="center" />
-            <el-table-column prop="unTaxPrice" label="未含税价" width="130" align="center" />
+            <el-table-column prop="discountPrice" label="折后单价" align="center" min-width="150" />
+            <el-table-column prop="discountAmount" label="分摊优惠" align="center" min-width="150" />
+            <el-table-column prop="amount" label="惠后金额" align="center" min-width="150" />
+            <el-table-column prop="weight" label="重量" align="center" min-width="150" />
+            <el-table-column prop="taxTotalAmount" label="未含税总额" align="center"  min-width="150"/>
+            <el-table-column prop="unTaxPrice" label="未含税价" align="center" min-width="150" />
           </el-table>
           <el-row class="rowStyle">
             <el-col :span="4">
@@ -290,7 +290,7 @@
       </div>
     </el-dialog>
     <!-- 选择客户 -->
-    <el-dialog title="选择客户" :visible.sync="customerVisible" width="70%" :show-close="false">
+    <el-dialog title="选择客户" :visible.sync="customerVisible" width="70%">
       <div>
         <el-form ref="multipleTable" :inline="true" :model="customerQuery" class="vinNoForm" label-width="100px">
           <el-form-item label="客户名称">
diff --git a/src/views/sales/salesOrder/salesOrderInfo.vue b/src/views/sales/salesOrder/salesOrderInfo.vue
index ecdcc26..78e892c 100644
--- a/src/views/sales/salesOrder/salesOrderInfo.vue
+++ b/src/views/sales/salesOrder/salesOrderInfo.vue
@@ -10,49 +10,72 @@
       <div class="listconadd">
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
-            <el-col :span="8">
-              <div class="span-sty">制单人</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">制单部门</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            <el-col :span="6">
+              <el-form-item>
+                <div style="text-align: right">
+                  <span>{{ formobj.billTypeValue }}</span>
+                </div>
+              </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">制单日期</div>
+            <el-col :span="6">
+              <div class="span-sty">下单时间</div>
               <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
+            <el-col :span="6">
+              <div class="span-sty">订单号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">店铺名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.shopName }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">订单类型</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">仓库</div>
               <el-form-item><span class="addinputInfo">{{ formobj.warehouseName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">配送方式</div>
               <el-form-item><span class="addinputInfo">{{ formobj.deliveryTypeValue }}</span></el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">物流公司</div>
+            <el-col :span="6">
+              <div class="span-sty">快递公司</div>
               <el-form-item><span class="addinputInfo">{{ formobj.logisticsName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">业务员</div>
-              <el-form-item></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.salesName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">货到付款</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.isFirstPay == '1' ? '是' : formobj.isFirstPay == '0' ? '否' : '' }}</span></el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">客户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">收货人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.shipperName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">手机号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.shipperMob }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">固话</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.phone }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
+              <div class="span-sty">详细地址</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deliveryProvince }}{{ formobj.deliveryCity }}{{ formobj.deliveryCounty }}{{ formobj.deliveryAddress }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">货到付款</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isFirstPay == '1' ? '是' : formobj.isFirstPay == '0' ? '否' : '' }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
@@ -116,21 +139,26 @@
           <div class="title">商品</div>
           <el-table :key="commodityKey" :data="formobj.goodsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-            <el-table-column prop="goodsSpuName" label="商品名称" width="200" align="center" />
-            <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
-            <el-table-column prop="weight" label="重量" width="100" align="center" />
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" min-width="200" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" min-width="200" />
             <el-table-column prop="unit" label="单位" width="100" align="center" />
-            <el-table-column prop="auxiliaryUnit" label="辅单位数量" width="120" align="center" />
-            <el-table-column prop="count" label="数量" width="150" align="center" />
-            <el-table-column prop="price" label="单价" width="100" align="center" />
-            <el-table-column prop="discountRtate" label="折扣率" width="150" align="center" />
-            <el-table-column prop="discountPrice" label="折后单价" width="100" align="center" />
-            <el-table-column prop="dueAmount" label="应收款" width="100" align="center" />
-            <el-table-column prop="cost" label="商品成本" width="150" align="center" />
-            <el-table-column prop="discountAmount" label="分摊优惠" width="100" align="center" />
-            <el-table-column prop="amount" label="惠后金额" width="100" align="center" />
+            <el-table-column prop="count" label="数量" align="center" min-width="150" />
+            <el-table-column prop="batchNumber" label="批次号" align="center" min-width="150" />
+            <el-table-column prop="price" label="单价" align="center" min-width="150" />
+            <el-table-column prop="taxRate" label="税率" align="center" min-width="150" />
+            <el-table-column prop="taxAmount" label="税额" align="center" min-width="150" />
+            <el-table-column prop="dueAmount" label="应收款" align="center" min-width="150" />
+            <el-table-column prop="cost" label="商品成本" align="center" min-width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
+            <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" min-width="150" />
+            <el-table-column prop="discountRtate" label="折扣率" align="center" min-width="150" />
+            <el-table-column prop="auxiliaryUnit" label="辅单位数量" align="center" min-width="150" />
+            <el-table-column prop="discountPrice" label="折后单价" align="center" min-width="150" />
+            <el-table-column prop="discountAmount" label="分摊优惠" align="center" min-width="150" />
+            <el-table-column prop="amount" label="惠后金额" align="center" min-width="150" />
+            <el-table-column prop="weight" label="重量" align="center" min-width="150" />
+            <el-table-column prop="taxTotalAmount" label="未含税总额" align="center"  min-width="150"/>
+            <el-table-column prop="unTaxPrice" label="未含税价" align="center" min-width="150" />
           </el-table>
           <el-row class="rowStyle">
             <el-col :span="6">