完善销售订单、订单审核

src/views/sales/salesOrder/salesOrder.vue

@@ -61,6 +61,7 @@
             <el-table-column label="操作" width="180" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" :disabled="scope.row.state == '已审核' || scope.row.state == '审核中'" size="small" @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
             <el-table-column prop="billNo" label="单据编号" align="center" width="190" />
@@ -298,6 +299,10 @@ export default {
       this.viewState = 3
       this.$refs['divAdd'].showEdit(row)
     },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
     // 删除
     doDel() {
       if (this.sids.length === 0) {

src/views/sales/salesOrder/salesOrderAdd.vue

@@ -63,7 +63,7 @@
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.logisticsName" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="6">
-              <div class="span-sty">业务员</div>
+              <div class="span-sty">快递业务员</div>
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.salesName" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
@@ -907,17 +907,19 @@ export default {
       this.formobj.bankAccount = ''
       this.formobj.bankAccountKey = ''
       this.dialogVisible = true
-      const aa = []
+      if (this.formobj.accounts.length === 0) {
-      if (this.bankAccount_list.length > 0) {
+        const aa = []
-        this.bankAccount_list.forEach((e) => {
+        if (this.bankAccount_list.length > 0) {
-          aa.push({
+          this.bankAccount_list.forEach((e) => {
-            bankAccount: e.dictValue,
+            aa.push({
-            bankAccountKey: e.dictKey,
+              bankAccount: e.dictValue,
-            amount: ''
+              bankAccountKey: e.dictKey,
+              amount: ''
+            })
           })
-        })
+        }
+        this.formobj.accounts = aa
       }
-      this.formobj.accounts = aa
     },
     handleConfirm() {
       this.dialogVisible = false

src/views/sales/salesOrder/salesOrderInfo.vue

@@ -44,7 +44,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.logisticsName }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
-              <div class="span-sty">业务员</div>
+              <div class="span-sty">快递业务员</div>
               <el-form-item><span class="addinputInfo">{{ formobj.salesName }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -86,56 +86,6 @@
               <el-form-item><el-image class="addinputInfo" style="width: 100px;height: 100px" v-for="(item, index) in formobj.files" :key="index" :src="item" :preview-src-list="formobj.files" /> </el-form-item>
             </el-col>
           </el-row>
-          <div class="title">客户信息</div>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">客户</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">收货人</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.shipperName }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">手机号</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.shipperMob }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="16">
-              <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="8">
-              <div class="span-sty">邮编</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.postCode }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <div class="title">发票信息</div>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">是否开发票</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">发票类型</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.invoiceType }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">开票名称</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.invoiceTitle }}</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.taxpayerNo }}</span></el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <div class="span-sty">税率(%)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.taxRate }}</span></el-form-item>
-            </el-col>
-          </el-row>
           <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" />
@@ -416,18 +366,6 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
-/deep/ .el-form-item__error {
-  margin-left: 120px !important;
-}
-.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-  margin-left: 120px !important;
-  width: calc(100% - 115px);
-}
-.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
-  display: inline;
-  line-height: 1px;
-  vertical-align: middle;
-}
 .rowStyle {
   border: 0;
 }

src/views/sales/salesOrderReview/salesOrderReview.vue

@@ -60,7 +60,6 @@
             <el-table-column prop="goodsTotalCount" label="商品总数" align="center" min-width="120" />
             <el-table-column prop="picOnline" label="线上商品图片" align="center" min-width="130" />
             <el-table-column prop="picSys" label="系统商品图片" align="center" min-width="130" />
-            <el-table-column prop="deliveryTypeValue" label="商品概况" align="center" min-width="100" />
             <el-table-column prop="remarksOnlineSys" label="线上备注/系统备注" align="center" min-width="160" />
             <el-table-column prop="buyerMessage" label="买家留言/附加信息" align="center" min-width="160" />
             <el-table-column prop="warehouseName" label="仓库" align="center" min-width="100" />
@@ -367,7 +366,16 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
-      billType_list: [],
+      billType_list: [
+        {
+          dictKey: '001',
+          dictValue: '线下订单'
+        },
+        {
+          dictKey: '002',
+          dictValue: '预售订单'
+        }
+      ],
       FormLoading: false,
       listLoading: false,
       // 翻页
@@ -448,11 +456,6 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'billType' }).then((res) => {
-        if (res.success) {
-          this.billType_list = res.data
-        }
-      })
       typeValues({ type: 'invoiceType' }).then((res) => {
         if (res.success) {
           this.invoiceType_list = res.data