Merge branch 'sit'

src/components/addr-add-edit-modal/index.vue

@@ -156,7 +156,7 @@ export default {
         addr_code: [
           {
             type: "array",
-            required: true,
+            required: false,
             message: "收货省市区不能为空",
             trigger: "change",
           },

src/components/globalComponents/digital-input/main.vue

@@ -56,6 +56,25 @@ export default {
     newTime: function (val) {
       // console.log(this.name + "=" + this.values);
       this.num = this.values;
+      this.$emit("reschange", this.num);
+    },
+    min: function (val) {
+      let a = this.accMul(val, "1");
+      let b = this.accMul(this.num, "1");
+      console.log(a, b);
+      if (a > b) {
+        this.num = a + "";
+        this.$emit("reschange", this.num);
+      }
+    },
+    max: function (val) {
+      let a = this.accMul(val, "1");
+      let b = this.accMul(this.num, "1");
+      console.log(a, b);
+      if (a < b) {
+        this.num = a + "";
+        this.$emit("reschange", this.num);
+      }
     },
   },
   data() {
@@ -69,6 +88,21 @@ export default {
       this.$emit("reschange", this.num);
       // console.log(value);
     },
+    accMul(arg1, arg2) {
+      var m = 0,
+        s1 = arg1.toString(),
+        s2 = arg2.toString();
+      try {
+        m += s1.split(".")[1].length;
+      } catch (e) {}
+      try {
+        m += s2.split(".")[1].length;
+      } catch (e) {}
+      return (
+        (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) /
+        Math.pow(10, m)
+      );
+    },
   },
 };
 </script>

src/components/in-addr-model/index.vue

@@ -163,7 +163,7 @@ export default {
         addr_code: [
           {
             type: "array",
-            required: true,
+            required: false,
             message: "收货省市区不能为空",
             trigger: "change",
           },
@@ -440,10 +440,10 @@ export default {
         model.isok = false;
         model.message = "收货联系电话格式不正确!";
       }
-      if (addr_code.length !== 3 && model.isok) {
-        model.isok = false;
-        model.message = "收货省市区不能为空!";
-      }
+      // if (addr_code.length !== 3 && model.isok) {
+      //   model.isok = false;
+      //   model.message = "收货省市区不能为空!";
+      // }
       if (addr === "" && model.isok) {
         model.isok = false;
         model.message = "详细地址不能为空!";

src/components/show-good-data-modal/ShowDataTableColumns.js

@@ -50,7 +50,7 @@ export default [
     span: 8,
   },
   {
-    prop: "platform_code_en",
+    prop: "plat_code",
     label: "平台商品编码",
     span: 8,
   },

src/components/show-good-data-modal/columns.js

@@ -64,7 +64,7 @@ const columns = [
     "min-width": "160px",
   },
   {
-    prop: "platform_code_en",
+    prop: "plat_code",
     label: "平台编号",
     width: "170px",
   },

src/views/login/index.vue

@@ -268,10 +268,11 @@ export default {
         .then((res) => {
           console.log(res);
           window.vm.$router.push({
-            path:
-              this.redirect || res === "success-dataV"
-                ? "/bigScreen/datavScr"
-                : "/welcome",
+            path: this.redirect
+              ? this.redirect
+              : res === "success-dataV"
+              ? "/bigScreen/datavScr"
+              : "/welcome",
             query: this.otherQuery,
           });
           this.loading = false;

src/views/orderEntry/orderConfirm/columns.js

@@ -115,7 +115,7 @@ const rules = {
   addr_code: [
     {
       type: "array",
-      required: true,
+      required: false,
       message: "收货省市区不能为空",
       trigger: "change",
     },

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

@@ -458,7 +458,7 @@ export default {
         addr_code: [
           {
             type: "array",
-            required: true,
+            required: false,
             message: "收货省市区不能为空",
             trigger: "change",
           },

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

@@ -177,7 +177,7 @@
             </el-col>
             <el-col :span="12" v-show="ruleForm.good_code">
               <el-row>
-                <el-col :span="16">
+                <el-col :span="24">
                   <el-form-item label="活动类型" prop="goodtype">
                     <el-cascader
                       v-model="ruleForm.goodtype"
@@ -189,15 +189,7 @@
                     ></el-cascader>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="剩余库存" label-width="75px">
-                    <el-input
-                      v-model="ruleForm.activity_stock"
-                      disabled
-                      maxlength="200"
-                      placeholder="剩余库存"
-                    /> </el-form-item
-                ></el-col>
+
                 <!-- <el-col :span="12">
                   <el-form-item label="凭证文件" prop="proof_id">
                     <el-tooltip
@@ -270,7 +262,31 @@
                     </ul>
                   </el-form-item>
                 </el-col> -->
-
+                <el-col :span="12">
+                  <el-form-item label="剩余库存">
+                    <el-input
+                      v-model="ruleForm.activity_stock"
+                      disabled
+                      maxlength="200"
+                      placeholder="剩余库存"
+                    /> </el-form-item
+                ></el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="系统最低售价"
+                    prop="good_price"
+                    label-width="110px"
+                  >
+                    <el-input
+                      v-model="ruleForm.good_price"
+                      disabled
+                      maxlength="20"
+                      v-loading="priceLoding"
+                    >
+                      <template slot="append">元</template></el-input
+                    >
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="销售数量" prop="good_num">
                     <digital-input
@@ -290,15 +306,28 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="销售单价" prop="good_price">
-                    <el-input
-                      v-model="ruleForm.good_price"
-                      disabled
-                      maxlength="20"
-                      v-loading="priceLoding"
-                    >
-                      <template slot="append">元</template></el-input
-                    >
+                  <el-form-item label="销售单价" prop="new_good_price">
+                    <digital-input
+                      :values="ruleForm.new_good_price"
+                      :placeholder="'销售数量'"
+                      :min="ruleForm.good_price || 0"
+                      :disabled="ruleForm.good_price === '0'"
+                      :max="
+                        ruleForm &&
+                        ruleForm.goodtype &&
+                        ruleForm.goodtype.length === 2 &&
+                        (ruleForm.goodtype[1] == '2' ||
+                          ruleForm.goodtype[1] == '3')
+                          ? 0
+                          : 100000000000
+                      "
+                      :position="'right'"
+                      :precision="2"
+                      :size="'mini'"
+                      :controls="false"
+                      :append="''"
+                      @reschange="number_change($event, 'new_good_price')"
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -614,7 +643,9 @@
         "
       >
         <p>
-          订单总金额：{{ accMul(ruleForm.good_num, ruleForm.good_price) || 0 }}
+          订单总金额：{{
+            accMul(ruleForm.good_num, ruleForm.new_good_price) || 0
+          }}
         </p>
         <el-button :size="'mini'" type="primary" @click="submitForm"
           >保 存
@@ -745,14 +776,15 @@ export default {
         customer_code: [], // 企业客户选择
         platform_id: "",
         arrtime: "", //要求到货时间
+        new_good_price: "0",
         // proof_id: "", //凭证ID
         proof_type: "", //凭证类型
         proof_url: "", //凭证地址
         activity_stock: "0",
         is_activity: "0", //是否参与活动,
         goodtype: ["is_activity_0", "1"], //活动类型
-        good_num: "", //商品数量
-        good_price: "0", //商品单价
+        good_num: "0", //商品数量
+        good_price: 0, //商品单价
         platform_order: "", //平台订单号
         paytime: "", //承诺回款时间
         workNo: "", //其他单号
@@ -791,6 +823,13 @@ export default {
             trigger: "change",
           },
         ],
+        new_good_price: [
+          {
+            required: true,
+            message: "销售单价不能为空！",
+            trigger: "blur",
+          },
+        ],
         // proof_id: [
         //   {
         //     required: true,
@@ -861,7 +900,7 @@ export default {
 
         order_addr: {
           type: "array",
-          required: true,
+          required: false,
           message: "收货省市区不能为空",
           trigger: "change",
         },
@@ -927,13 +966,14 @@ export default {
             customer_code: [], // 企业客户选择
             platform_id: "",
             arrtime: "", //要求到货时间
+            new_good_price: "",
             // proof_id: "", //凭证ID
             proof_type: "", //凭证类型
             proof_url: "", //凭证地址
             activity_stock: "0",
             goodtype: ["is_activity_0", "1"], //活动类型
             good_num: "0", //商品数量
-            good_price: "0", //商品单价
+            good_price: 0, //系统商品单价
             platform_order: "", //平台订单号
             paytime: "", //承诺回款时间
             workNo: "", //其他单号
@@ -1050,7 +1090,7 @@ export default {
       });
       if (code === 0) {
         this.goods_sitem = data;
-        console.log("1111111111111111", this.goods_sitem);
+        // console.log("1111111111111111", this.goods_sitem);
         this.goods_sitem.good_info_img =
           this.goods_sitem.good_info_img.split(",");
         const { weight } = this.goods_sitem;
@@ -1097,12 +1137,20 @@ export default {
     },
     async number_change(e, key) {
       this.ruleForm[key] = e + "" || "0";
+      console.log(key);
+      console.log(this.ruleForm.new_good_price);
       this.$refs.ruleForm.validateField(key);
       if (key === "good_num") {
         await this.get_new_price();
       }
     },
     async get_new_price() {
+      console.log(
+        this.ruleForm.goodtype,
+        this.ruleForm.goodtype.length === 2,
+        this.ruleForm.goodtype[1] == "2" || this.ruleForm.goodtype[1] == "3"
+      );
+
       const { goodtype, good_num } = this.ruleForm;
 
       let oldGood_type = goodtype.length === 2 ? goodtype[1] : "";
@@ -1140,7 +1188,8 @@ export default {
       }
       if (!this.priceLoding) {
         const { isok, price, stock } = await this.set_salegetprice();
-        this.ruleForm.good_price = isok ? price : "0";
+        console.log(this.accMul(price, 1));
+        this.ruleForm.good_price = isok ? price : 0;
       }
 
       this.order_good_num = {
@@ -1279,10 +1328,17 @@ export default {
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           model.addrlist = [];
           model.customer_code = model.customer_code.toString();
-
+          const {good_price,new_good_price}=model
+          let a=this.accMul(good_price, '1'),b=this.accMul(new_good_price, '1')
+          if(a!==b){
+            model.good_price
+          }
+          // if (model.new_good_price == model.good_price) {
+          // model.good_price = model.new_good_price;F
+          // }
           delete model["proof_type"];
           delete model["proof_url"];
-          delete model["good_price"];
+          delete model["new_good_price"];
           if (sendtype === "1") {
             let addrT = 0,
               isAEdit = false;

src/views/sellOut/sellOutOrder/columns.js

@@ -378,16 +378,26 @@ const sendOutOrderColumns=[
   },
   {
     prop: "value26",
-    label: "发货申请单物流单号",
+    label: "平台订单号",
     width: "150px"
   },
   {
     prop: "value27",
+    label: "发货申请单物流公司",
+    width: "150px"
+  },
+  {
+    prop: "value28",
+    label: "发货申请单物流单号",
+    width: "150px"
+  },
+  {
+    prop: "value29",
     label: "发货申请单物流费用",
     width: "140px"
   },
   {
-    prop: "value28",
+    prop: "value30",
     label: "发货申请单备注",
     'min-width': "150px"
   },
@@ -419,6 +429,8 @@ const head = [
   "收货地址",
   "到货时间",
   "发货申请单号",
+  "平台订单号",
+  "发货申请单物流公司",
   "发货申请单物流单号",
   "发货申请单物流费用",
   "发货申请单备注",

src/views/sellOut/sellOutOrder/sendOutOrder.vue

@@ -141,17 +141,17 @@ export default {
         this.tableData.forEach((key, index) => {
           if (
             key["value25"] === "" ||
-            key["value26"] === "" ||
-            key["value27"] === "" ||
-            key["value28"] === ""
+            key["value28"] === "" ||
+            key["value29"] === "" ||
+            key["value30"] === ""
           ) {
             isok = false;
           }
           let ketitem = {
             outCode: key["value25"],
-            post_code: key["value26"],
-            post_fee: key["value27"],
-            remark: key["value28"],
+            post_code: key["value28"],
+            post_fee: key["value29"],
+            remark: key["value30"],
           };
 
           console.log(ketitem);

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

@@ -569,7 +569,7 @@ export default {
         addr_code: [
           {
             type: "array",
-            required: true,
+            required: false,
             message: "收货省市区不能为空",
             trigger: "change",
           },