Просмотр исходного кода

fix(发货单): 优化表单样式和代码格式,修复回执要求单选组件的显示问题

yusheng 7 месяцев назад
Родитель
Сommit
821e809ac4
1 измененных файлов с 77 добавлено и 60 удалено
  1. 77 60
      src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

+ 77 - 60
src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -118,7 +118,7 @@
             <el-input clearable v-model="form.printNo" />
           </el-form-item>
         </el-col>
-        <el-col :span="12" style="height: 40px;">
+        <el-col :span="12" style="height: 40px">
           <el-form-item label="送货方式" prop="deliveryTypeId">
             <DictSelection
               dictName="送货方式"
@@ -136,7 +136,12 @@
         <el-col :span="12">
           <el-form-item label="回执要求" prop="receiptRequirementTypeId">
             <el-radio-group v-model="form.receiptRequirementTypeId">
-              <el-radio v-for="item in receiptRequirementTypeOption" :key="item.value" :label="item.value">{{item.label}}</el-radio>
+              <el-radio
+                v-for="item in receiptRequirementTypeOption"
+                :key="item.value"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -284,9 +289,7 @@
   import { parameterGetByCode } from '@/api/main/index.js';
   import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
   import returnOrderDialog from '@/views/saleManage/saleOrder/customerReturnOrder/returnOrderDialog.vue';
-import {
-    getReturnSaleOrderrecordDetail,
-  } from '@/api/saleManage/returnGoods';
+  import { getReturnSaleOrderrecordDetail } from '@/api/saleManage/returnGoods';
 
   export default {
     mixins: [dictMixins],
@@ -324,7 +327,7 @@ import {
       isReturnGoodsCreate: {
         type: Boolean,
         default: false
-      },
+      }
     },
     data() {
       let formDef = {
@@ -351,7 +354,7 @@ import {
         replaceList: [],
         deliveryTypeId: '',
         receiptRequirementTypeId: 2,
-        sourceType: '',  // 1 销售订单 2 受托收货单 3 退货单
+        sourceType: '', // 1 销售订单 2 受托收货单 3 退货单
         sourceId: '',
         sourceNo: ''
       };
@@ -379,16 +382,20 @@ import {
         isUpdate: false,
         businessId: '',
         isTotalCount: 0,
-        receiptRequirementTypeOption: [{
-          label: '签回单',
-          value: 1
-        }, {
-          label: '不签回单',
-          value: 2
-        }, {
-          label: '带签收单',
-          value: 3
-        }],
+        receiptRequirementTypeOption: [
+          {
+            label: '签回单',
+            value: 1
+          },
+          {
+            label: '不签回单',
+            value: 2
+          },
+          {
+            label: '带签收单',
+            value: 3
+          }
+        ]
       };
     },
     computed: {
@@ -396,25 +403,37 @@ import {
         return this.$store.state.order.allcountAmount;
       },
       rules() {
-          return {
-            partaName: [
-              { required: true, message: '请选择客户名称', trigger: 'change' }
-            ],
-            linkName: [
-              { required: this.form.needProduce != 2  ? true : false, message: '请输入', trigger: ['blur', 'change'] }
-            ],
-            linkPhone: [ 
-              { required: this.form.needProduce != 2 ? true : false, message: '请输入', trigger: 'change' }
-            ],
-            orderNo: [{ required: true, message: '请选择', trigger: 'change' }],
-            receiveAddress: [
-              { required: this.form.needProduce != 2 ? true : false, message: '请输入', trigger: 'change' }
-            ],
-            deviceName: [
-              { required: true, message: '前选择车辆', trigger: 'change' }
-            ]
-          }
-        }
+        return {
+          partaName: [
+            { required: true, message: '请选择客户名称', trigger: 'change' }
+          ],
+          linkName: [
+            {
+              required: this.form.needProduce != 2 ? true : false,
+              message: '请输入',
+              trigger: ['blur', 'change']
+            }
+          ],
+          linkPhone: [
+            {
+              required: this.form.needProduce != 2 ? true : false,
+              message: '请输入',
+              trigger: 'change'
+            }
+          ],
+          orderNo: [{ required: true, message: '请选择', trigger: 'change' }],
+          receiveAddress: [
+            {
+              required: this.form.needProduce != 2 ? true : false,
+              message: '请输入',
+              trigger: 'change'
+            }
+          ],
+          deviceName: [
+            { required: true, message: '前选择车辆', trigger: 'change' }
+          ]
+        };
+      }
     },
 
     methods: {
@@ -430,11 +449,13 @@ import {
       //选择订单回调
       changeOrder(obj) {
         this.form = Object.assign({}, this.form, {
-          productionRequirements: obj.map((item) => item.productionRequirements).toString(),
+          productionRequirements: obj
+            .map((item) => item.productionRequirements)
+            .toString(),
           orderIds: obj.map((item) => item.id).toString(),
           orderNo: obj.map((item) => item.orderNo).toString(),
           // needProduce: obj.map((item) => item.needProduce),
-          sourceType: 1,
+          sourceType: 1
         });
         this.getSaleOrderDetails(obj.map((item) => item.id));
       },
@@ -444,7 +465,7 @@ import {
           code: 'eom_saleOrder_addInvoice'
         });
 
-        console.log('eom_saleOrder_addInvoice', res)
+        console.log('eom_saleOrder_addInvoice', res);
 
         let data = {
           ...res[0],
@@ -531,7 +552,7 @@ import {
             productionRequirements,
             needProduce
           });
-          console.log('form~~~~~~~~~~', this.form)
+          console.log('form~~~~~~~~~~', this.form);
           productList.forEach((item, index) => {
             item['tempId'] = index;
             item.id = '';
@@ -571,7 +592,7 @@ import {
       async getSaleOrderDetails(ids) {
         this.loading = true;
         let res = await getSaleOrderDetails(ids);
-        console.log('res~~~~', res)
+        console.log('res~~~~', res);
         if (res?.length) {
           this.setData(res);
         }
@@ -610,7 +631,7 @@ import {
         } else if (data.saleOrder) {
           this.setData([data.saleOrder], 'sendInit');
         }
-        console.log('data~~~~', data)
+        console.log('data~~~~', data);
         this.loading = false;
         if (data) {
           this.$nextTick(() => {
@@ -620,7 +641,7 @@ import {
             data.carNo = data.carNo ? data.carNo.split(',') : [];
             this.form = data;
             this.form.needProduce = data?.saleOrderList[0]?.needProduce;
-            this.form.deliveryTypeId = data.deliveryTypeId+'';
+            this.form.deliveryTypeId = data.deliveryTypeId + '';
             this.$refs.inventoryTableref &&
               this.$refs.inventoryTableref.putTableValue(
                 data.productList,
@@ -659,7 +680,7 @@ import {
             pricingWay: '',
             sourceNo: '',
             sourceId: '',
-            sourceType: '',
+            sourceType: ''
           });
           this.$refs.inventoryTableref &&
             this.$refs.inventoryTableref.putTableValue([], true);
@@ -672,7 +693,7 @@ import {
       },
       // 获取退货单数据
       async getSReturnOrderInfo(row) {
-        console.log('row~~~~', row)
+        console.log('row~~~~', row);
         // this.form = Object.assign({}, this.form, {
         //   sourceId: row.id,
         //   sourceNo: row.returnNo,
@@ -749,20 +770,17 @@ import {
               projectId,
               projectSn: projectCode
             });
-            
 
             productList.forEach((item, index) => {
               item['tempId'] = index;
               item.id = '';
             });
 
-
-
             this.oldProductList = JSON.parse(JSON.stringify(productList));
 
             this.$refs.inventoryTableref &&
               this.$refs.inventoryTableref.putTableValue(productList, true);
-          })
+          });
         }
       },
       //选择受托收货单弹框
@@ -785,7 +803,7 @@ import {
             pricingWay: '',
             sourceNo: '',
             sourceId: '',
-            sourceType: '',
+            sourceType: ''
           });
           this.$refs.inventoryTableref &&
             this.$refs.inventoryTableref.putTableValue([], true);
@@ -834,7 +852,7 @@ import {
             pricingWay,
             entrustedCode: code,
             entrustedId: id,
-            sourceType: 2,
+            sourceType: 2
           });
           this.getSaleOrderDetails([orderId]);
           // productList.forEach((item, index) => {
@@ -869,7 +887,7 @@ import {
             productionRequirements: '',
             sourceType: '',
             sourceNo: '',
-            sourceId: '',
+            sourceId: ''
           });
           this.$refs.inventoryTableref &&
             this.$refs.inventoryTableref.putTableValue([]);
@@ -883,9 +901,10 @@ import {
 
       //打开新增编辑弹框
       async open(type, row, orderId) {
+        this.visible = true;
+
         this.title = type === 'add' ? '新增发货单' : '修改';
         this.parameterGetByCode();
-        this.visible = true;
         this.carList = await carBookPageListAPI({ pageNum: 1, size: 100 });
 
         if (orderId) {
@@ -898,8 +917,8 @@ import {
           await this.getSendSaleOrderDetail(row?.id);
         }
 
-        if(this.isReturnGoodsCreate && type == 'add') {
-          this.getSReturnOrderInfo(row)
+        if (this.isReturnGoodsCreate && type == 'add') {
+          this.getSReturnOrderInfo(row);
         }
 
         if (type == 'add') {
@@ -983,7 +1002,7 @@ import {
               item['isReplace'] = 1;
             }
 
-            if(item.isSuspend == 1) {
+            if (item.isSuspend == 1) {
               item.offsetDetail[0]['reverseQuantity'] = item.saleCount;
               item['reverseQuantity'] = item.saleCount;
             } else {
@@ -1038,10 +1057,8 @@ import {
       async sendSubmit(res) {
         console.log('res~~~~~~', res, this.businessId);
         let paramsId = this.isReturnGoodsCreate ? res : this.businessId || res;
-        console.log('paramsId~~~', paramsId)
-        const data = await getSendSaleOrderrecordDetailSplit(
-          paramsId
-        );
+        console.log('paramsId~~~', paramsId);
+        const data = await getSendSaleOrderrecordDetailSplit(paramsId);
         let storemanIds = '';
         console.log('data~~~~~~', data);
         let ids = data.productList.map((item) => item.warehouseId);