1

src/apis/service/sellOut/salesOrder/index.js

@@ -28,4 +28,6 @@ export default {
   saleaddother: (data, params) => http(api + "saleaddother", data, "post", params),
   //延时发货追加地址
   saleaddr: (data, params) => http(api + "saleaddr", data, "post", params),
+  // 区编码获取省市区汉字
+  addrall: (data, params) => http(api + "addrall", data, "post", params),
 };

src/views/sellOut/salesOrder/components/ShowDataTableColumns.js

@@ -231,11 +231,11 @@ const showColumns = [
     label: "其他单号",
     span: 12,
   },
-  // {
-  //   prop: "remark",
-  //   label: "备注",
-  //   span: 24,
-  // },
+  {
+    prop: "remark",
+    label: "备注",
+    span: 24,
+  },
 
 ]
 

src/views/sellOut/salesOrder/components/addForm.vue

@@ -1092,7 +1092,7 @@ export default {
         this.ruleForm.activity_stock = 0 + "";
       }
       if (!this.priceLoding) {
-        const { isok, price ,stock} = await this.set_salegetprice();
+        const { isok, price, stock } = await this.set_salegetprice();
         this.ruleForm.good_price = isok ? price : "0";
       }
 
@@ -1174,9 +1174,34 @@ export default {
       this.addrForm.order_addr[index].addr_code = e;
     },
     //省市区保存某一行
-    checkRow(rowIndex) {
-      this.$refs.addrForm.validate((valid) => {
+    async checkRow(rowIndex) {
+      await this.$refs.addrForm.validate(async (valid) => {
         if (valid) {
+          const { addr_code } = this.addrForm.order_addr[rowIndex];
+          if (addr_code && addr_code.length === 3) {
+            let arrCode = addr_code[addr_code.length - 1];
+            // console.log(model);
+            let { code, data, message } = await asyncRequest.addrall({
+              code: arrCode,
+            });
+            if (code === 0) {
+              const { province, city, area } = data;
+              let province_name =
+                province && province.name ? province.name : "";
+              let city_name = city && city.name ? city.name : "";
+              let area_name = area && area.name ? area.name : "";
+              this.addrForm.order_addr[rowIndex].addr_code_name =
+                province_name && city_name && area_name
+                  ? `${province_name}/${city_name}/${area_name}`
+                  : "";
+            } else if (code >= 100 && code <= 104) {
+              await this.logout();
+            } else {
+              this.$message.warning(message);
+            }
+          } else {
+            this.addrForm.order_addr[rowIndex].addr_code_name = "";
+          }
           this.addrForm.order_addr[rowIndex].edit = false;
         } else {
           console.log("error submit!!");

src/views/sellOut/zixunOrder/components/buyGoodModal.vue

@@ -62,15 +62,15 @@
             status-icon
             :rules="rulesThis"
             :size="'mini'"
-            label-width="90px"
+            label-width="55px"
             class="demo-ruleForm"
           >
             <el-row>
-              <el-col :span="8">
-                <el-form-item label="购买数量" prop="good_num">
+              <el-col :span="5">
+                <el-form-item label="数量" prop="good_num">
                   <digital-input
                     :values="ruleForm.good_num"
-                    :placeholder="'购买数量'"
+                    :placeholder="'数量'"
                     :min="sitem.in_num"
                     :max="100000000000"
                     :position="'right'"
@@ -83,8 +83,8 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="商品单价" prop="sale_price">
+              <el-col :span="6">
+                <el-form-item label="单价" prop="sale_price">
                   <digital-input
                     :values="ruleForm.sale_price"
                     :placeholder="'商品单价'"
@@ -101,7 +101,20 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="发货方式" prop="sendtype">
+                <el-form-item label="总金额" prop="good_num" label-width="70px">
+                  <el-input
+                    v-model="total_price"
+                    placeholder="总金额"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item
+                  label="发货方式"
+                  prop="sendtype"
+                  label-width="90px"
+                >
                   <el-select
                     v-model="ruleForm.sendtype"
                     placeholder="发货方式"
@@ -122,6 +135,11 @@
                   >保 存
                 </el-button>
               </el-col>
+              <el-col :span="24">
+                <el-form-item label="订单备注" prop="remark" label-width="85px">
+                  <el-input v-model="ruleForm.remark" placeholder="订单备注" />
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </el-col>
@@ -407,6 +425,7 @@ export default {
     };
     return {
       loading: false,
+      total_price: "0",
       addrmodel: false,
       showModelThis: this.showModel,
       showGoodsModel: false,
@@ -429,6 +448,7 @@ export default {
         sale_price: "",
         sendtype: "1", // 发货方式
         arrtime: "", // 到货时间
+        remark: "",
       },
       rulesThis: this.rules,
       rules: {
@@ -449,10 +469,17 @@ export default {
         sendtype: [
           {
             required: true,
-            message: "请选择商品",
+            message: "请选择发货方式",
             trigger: "change",
           },
         ],
+        remark: [
+          {
+            required: true,
+            message: "输入订单备注",
+            trigger: "blur",
+          },
+        ],
       },
       addrForm: {
         order_addr: [], //收货地址
@@ -524,6 +551,13 @@ export default {
     num_change(e, key) {
       this.ruleForm[key] = e + "";
       this.$refs.ruleForm.validateField(key);
+      this.set_total_price();
+    },
+    set_total_price() {
+      const { good_num, sale_price } = this.ruleForm;
+      let num = good_num * 1;
+      let price = sale_price * 1;
+      this.total_price = num * price + "";
     },
     async initForm() {
       this.loading = true;
@@ -540,6 +574,7 @@ export default {
       }
       await this.resetForm();
       this.getNewTime();
+      this.set_total_price();
       this.loading = false;
     },
     addrRefresh(e) {
@@ -556,13 +591,15 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { bidNo, in_num, in_arrival_time, sale_price } = this.sitem;
+          const { bidNo, in_num, in_arrival_time, sale_price, remark } =
+            this.sitem;
           this.ruleForm = {
             bidNo: bidNo || "", //咨询单反馈编号
             good_num: in_num || "0", //商品数量
             sale_price: sale_price || "",
             sendtype: "1", // 发货方式
             arrtime: in_arrival_time || "", // 到货时间
+            remark:  "",
           };
         }