Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/enum/dict.js

@@ -65,7 +65,8 @@ export default {
   商品价格类型: 'goods_price_type',
   规则状态: 'rule_status',
   物品机型: 'product_model_key',
-  物品颜色: 'product_color_key'
+  物品颜色: 'product_color_key',
+  送货方式: 'delivery_method'
 };
 
 export const numberList = [

src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -107,17 +107,37 @@
             <el-input clearable v-model="form.printNo" />
           </el-form-item>
         </el-col>
+        <el-col :span="12" style="height: 40px;">
+          <el-form-item label="送货方式" prop="deliveryTypeId">
+            <DictSelection
+              dictName="送货方式"
+              clearable
+              v-model="form.deliveryTypeId"
+              style="width: 100%"
+            >
+            </DictSelection>
+          </el-form-item>
+        </el-col>
 
+        <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-group>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item prop="sendFiles" label="发货附件">
             <fileMain v-model="form.sendFiles"></fileMain>
           </el-form-item>
         </el-col>
+
         <el-col :span="12">
           <el-form-item prop="repliedFiles" label="回执附件">
             <fileMain v-model="form.repliedFiles"></fileMain>
           </el-form-item>
         </el-col>
+
         <el-col :span="12">
           <el-form-item prop="makerName" label="制单人" v-if="form.makerName">
             <el-input disabled v-model="form.makerName" />
@@ -281,7 +301,9 @@
         orderId: '',
         replied: 0,
         trayNum: '',
-        replaceList: []
+        replaceList: [],
+        deliveryTypeId: '',
+        receiptRequirementTypeId: 2
       };
 
       return {
@@ -321,7 +343,14 @@
         // 是否是修改
         isUpdate: false,
         businessId: '',
-        isTotalCount: 0
+        isTotalCount: 0,
+        receiptRequirementTypeOption: [{
+          label: '签回单',
+          value: 1
+        }, {
+          label: '不签回单',
+          value: 2
+        }],
       };
     },
     computed: {
@@ -474,6 +503,7 @@
       async getSaleOrderDetails(ids) {
         this.loading = true;
         let res = await getSaleOrderDetails(ids);
+        console.log('res~~~~', res)
         if (res?.length) {
           this.setData(res);
         }
@@ -512,7 +542,7 @@
         } else if (data.saleOrder) {
           this.setData([data.saleOrder], 'sendInit');
         }
-
+        console.log('data~~~~', data)
         this.loading = false;
         if (data) {
           this.$nextTick(() => {
@@ -521,6 +551,7 @@
             });
             data.carNo = data.carNo ? data.carNo.split(',') : [];
             this.form = data;
+            this.form.deliveryTypeId = data.deliveryTypeId+'';
             this.$refs.inventoryTableref &&
               this.$refs.inventoryTableref.putTableValue(
                 data.productList,

src/views/saleManage/saleOrder/invoice/components/detailDialog.vue

@@ -51,6 +51,12 @@
             <el-form-item label="托盘数：">
               <el-input v-model="form.trayNum" disabled></el-input>
             </el-form-item>
+            <el-form-item label="送货方式：">
+              <el-input v-model="form.deliveryTypeName" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="回执要求：">
+              <el-input v-model="form.receiptRequirementTypeName" disabled></el-input>
+            </el-form-item>
             <el-form-item label="发货附件：" prop="sendFiles">
               <fileMain v-model="form.sendFiles" type="view"></fileMain>
             </el-form-item>
@@ -216,12 +222,20 @@
             label: '刻码',
             align: 'center'
           }
-        ]
+        ],
+        receiptRequirementTypeOption: [{
+          label: '签回单',
+          value: 1
+        }, {
+          label: '不签回单',
+          value: 2
+        }],
       };
     },
     created() {
       this.requestDict('产地');
       this.requestDict('生产类型');
+      this.requestDict('送货方式');
     },
     computed: {
       clientEnvironmentId() {
@@ -264,6 +278,13 @@
             item.pricingWay = item.pricingWay || data.pricingWay;
           });
           this.form = data;
+          console.log(this.form, 'this.form.receiptRequirementTypeName~~~');  
+          this.form.deliveryTypeName = this.getDictValue(
+            '送货方式',
+            this.form.deliveryTypeId
+          );
+          this.form.receiptRequirementTypeName = this.receiptRequirementTypeOption.find(item => item.value == this.form.receiptRequirementTypeId)?.label;
+          
           this.detailData = data;
           console.log(data.productList, 'data.productList');
           this.$nextTick(() => {