xiaodai2022 2 lat temu
rodzic
commit
4e033c3bf8

+ 2 - 2
src/views/goodStore/active/components/baseForm.vue

@@ -324,7 +324,7 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "business_companyNo"]),
     powers() {
       let tran =
         this.$store.getters.btnList.find(
@@ -555,7 +555,7 @@ export default {
       this.ruleForm = {
         activity_name: activity_name || "",
         platform_code: platform_code || "",
-        company_id: company_id || "",
+        company_id: company_id || this.business_companyNo || "",
         activity_start: start || "",
         activity_end: end || "",
         activity_desc: activity_desc || "",

+ 2 - 2
src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1102,7 +1102,7 @@ import {
 export default {
   name: "goodsCostAdd",
   mixins: [resToken],
-  props: ["showModel", "id", "type", "sitem"],
+  props: ["showModel", "id", "type", "sitem", "business_companyNo"],
   components: {
     baseFormAddEdit,
     costFormAddEdit,
@@ -1673,7 +1673,7 @@ export default {
         good_type: "0",
         is_stock: "0",
         supplierNo: [],
-        company_id: "",
+        company_id: this.business_companyNo || "",
         is_auth: "",
         tax: "",
         good_name: "",

+ 5 - 1
src/views/sellOut/project/components/addForm.vue

@@ -230,12 +230,16 @@
 import asyncRequest from "@/apis/service/sellOut/project";
 import resToken from "@/mixins/resToken";
 import costFormAddEdit from "./costFormAddEdit";
+import { mapGetters } from "vuex";
 
 export default {
   name: "Account",
   props: ["showModel", "sitem", "id", "type", "newTime"],
   mixins: [resToken],
   components: { costFormAddEdit },
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   watch: {
     newTime: function (val) {
       if (val) {
@@ -469,7 +473,7 @@ export default {
       this.ruleForm = {
         name: "",
         platform: "",
-        companyNo: "",
+        companyNo: this.business_companyNo || "",
         khNo: [],
         customer_name: "",
         budget_total: "0",

+ 11 - 6
src/views/sellOut/returnOrder/components/auditForm.vue

@@ -288,10 +288,15 @@
 <script>
 import asyncRequest from "@/apis/service/sellOut/returnOrder";
 import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
+
 export default {
   name: "sellAfterApplyDetail",
   props: ["id", "newTime", "sitem"],
   mixins: [resToken],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   computed: {
     powers() {
       let tran =
@@ -483,7 +488,7 @@ export default {
             state: status === "4" ? "1" : "1",
             rebut: "",
             status_remark: status_remark || "",
-            companyNo: companyNo || "",
+            companyNo: companyNo || this.business_companyNo || "",
             can_sell_num: can_sell_num || "0",
             can_sell_wsm_com: can_sell_wsm_supplierNo
               ? [can_sell_wsm_supplierNo]
@@ -503,7 +508,6 @@ export default {
             defective_wsm_code: defective_wsm || "",
             defective_wsm_name: defective_wsm_name || "",
             loss_num: loss_num || "0",
-
           };
           // console.log(this.ruleForm);
           this.stateChange();
@@ -555,10 +559,11 @@ export default {
           };
 
           if (
-            (parseInt(this.return_num) !==
-            parseInt(can_sell_num) +
-              parseInt(defective_num) +
-              parseInt(loss_num))&&state === "1"
+            parseInt(this.return_num) !==
+              parseInt(can_sell_num) +
+                parseInt(defective_num) +
+                parseInt(loss_num) &&
+            state === "1"
           ) {
             this.$message.warning(
               "可销售数量+次品数量+丢失数量不等于总退货数!"

+ 39 - 34
src/views/sellOut/salesOrder/components/addForm.vue

@@ -94,7 +94,7 @@
                   v-model="ruleForm.good_code"
                   placeholder="请选择商品"
                   readonly
-                   maxlength="200"
+                  maxlength="200"
                   @focus="change_good_code"
                 />
                 <show-data-table
@@ -193,7 +193,7 @@
                     <el-input
                       v-model="ruleForm.activity_stock"
                       disabled
-                       maxlength="200"
+                      maxlength="200"
                       placeholder="剩余库存"
                     /> </el-form-item
                 ></el-col>
@@ -293,7 +293,7 @@
                     <el-input
                       v-model="ruleForm.good_price"
                       disabled
-                       maxlength="20"
+                      maxlength="20"
                       v-loading="priceLoding"
                     >
                       <template slot="append">元</template></el-input
@@ -398,7 +398,7 @@
                   <el-input
                     v-model="scope.row.receipt_quantity"
                     placeholder="收货总数"
-                     maxlength="20"
+                    maxlength="20"
                     :disabled="!scope.row.edit"
                   />
                 </el-form-item>
@@ -425,7 +425,7 @@
                   <el-input
                     v-model="scope.row.contactor"
                     placeholder="收件联系人"
-                     maxlength="20"
+                    maxlength="20"
                     :disabled="!scope.row.edit"
                   />
                 </el-form-item>
@@ -450,7 +450,7 @@
                   <el-input
                     v-model="scope.row.mobile"
                     placeholder="收货联系电话"
-                     maxlength="11"
+                    maxlength="11"
                     :disabled="!scope.row.edit"
                   />
                 </el-form-item>
@@ -502,7 +502,7 @@
                   <el-input
                     v-model="scope.row.addr"
                     placeholder="详细地址"
-                     maxlength="100"
+                    maxlength="100"
                     :disabled="!scope.row.edit"
                   />
                 </el-form-item>
@@ -612,7 +612,9 @@
           justify-content: space-between;
         "
       >
-        <p>订单总金额:{{accMul(ruleForm.good_num,ruleForm.good_price ) || 0 }}</p>
+        <p>
+          订单总金额:{{ accMul(ruleForm.good_num, ruleForm.good_price) || 0 }}
+        </p>
         <el-button :size="'mini'" type="primary" @click="submitForm"
           >保 存
         </el-button>
@@ -629,10 +631,14 @@ import inAddrModel from "@/components/in-addr-model";
 import showVoucherModel from "@/components/show-voucher-model";
 import searchGoodOnlineModal from "@/components/search-good-online-modal";
 import { addColumns } from "./ShowDataTableColumns";
+import { mapGetters } from "vuex";
 export default {
   name: "salesOrderDetail",
   mixins: [mixinPage, resToken],
   props: ["newTime", "id", "sitem", "type"],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   components: {
     inAddrModel,
     showVoucherModel,
@@ -878,23 +884,23 @@ export default {
   },
   mounted() {
     this.initForm();
-    
   },
   methods: {
     //乘法精度问题
     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);
+      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)
+      );
     },
     async initForm() {
       this.status = "";
@@ -916,7 +922,7 @@ export default {
 
           this.ruleForm = {
             order_type: "1",
-            supplierNo: "", //销售方编码
+            supplierNo: this.business_companyNo || "", //销售方编码
             customer_code: [], // 企业客户选择
             platform_id: "",
             arrtime: "", //要求到货时间
@@ -1043,7 +1049,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;
@@ -1099,9 +1105,9 @@ export default {
       const { goodtype, good_num } = this.ruleForm;
 
       let oldGood_type = goodtype.length === 2 ? goodtype[1] : "";
-    
-      if(oldGood_type == 2 || oldGood_type == 3){
-        this.ruleForm.good_price = 0
+
+      if (oldGood_type == 2 || oldGood_type == 3) {
+        this.ruleForm.good_price = 0;
       }
 
       const { ogood_type, ogood_num } = this.order_good_num;
@@ -1357,15 +1363,14 @@ export default {
         const { sale_price } = data;
         resModel.price = sale_price + "";
 
-      let oldGood_type = goodtype.length === 2 ? goodtype[1] : "";
-    
-      if(key_0 === "is_activity_0" && (oldGood_type == 2 || oldGood_type == 3)){
-        resModel.price  = 0+ ""
-      }
-
-        
+        let oldGood_type = goodtype.length === 2 ? goodtype[1] : "";
 
-        
+        if (
+          key_0 === "is_activity_0" &&
+          (oldGood_type == 2 || oldGood_type == 3)
+        ) {
+          resModel.price = 0 + "";
+        }
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {

+ 1 - 1
src/views/sellOut/salesOrder/index.vue

@@ -271,7 +271,7 @@ export default {
     userAddEdit,
   },
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size",]),
     powers() {
       let tran =
         this.$store.getters.btnList.find(

+ 6 - 1
src/views/sellOut/zixunOrder/components/addEditForm.vue

@@ -368,12 +368,16 @@
 import asyncRequest from "@/apis/service/sellOut/zixunOrder";
 import resToken from "@/mixins/resToken";
 import addEditGoodModal from "./addEditGoodModal";
+import {mapGetters} from "vuex"
 export default {
   name: "handover",
   props: ["id", "sitem", "newTime"],
   mixins: [resToken],
   components: {
     addEditGoodModal,
+  },
+   computed: {
+    ...mapGetters(["business_companyNo"]),
   },
   data() {
     return {
@@ -599,7 +603,7 @@ export default {
             projectNo: projectNo ? [projectNo] : [], //项目编号
             khNo: khNo ? [khNo] : [], //客户编号
             customer_name: customer_name || "", //客户名称
-            companyNo: companyNo || "",
+            companyNo: companyNo || this.business_companyNo || "",
             endtime: endtime || "", //咨询截止时间
             platform_code: platform_code || "", //平台id
             use_desc: "",
@@ -787,6 +791,7 @@ export default {
     async remoteMethod(query) {
       this.selectLoading = true;
       this.poptions = [];
+
       const { platform_code, companyNo, khNo } = JSON.parse(
         JSON.stringify(this.ruleForm)
       );

+ 27 - 16
src/views/sellOut/zixunOrder/components/editForm.vue

@@ -645,7 +645,12 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8" class="fr tr">
-                     <div class="lsac">咨询单总额:{{accMul(this.ruleForm.budget_price,this.ruleForm.num)}} (元)</div>
+                    <div class="lsac">
+                      咨询单总额:{{
+                        accMul(this.ruleForm.budget_price, this.ruleForm.num)
+                      }}
+                      (元)
+                    </div>
                     <el-button
                       v-if="type !== 'view'"
                       type="primary"
@@ -653,7 +658,7 @@
                       @click="submitForm"
                       >保 存
                     </el-button>
-                   
+
                     <!-- <el-button :size="'mini'" @click="showModelThis = false">{{
             id == "007" ? "关 闭" : "取 消"
           }}</el-button> -->
@@ -672,10 +677,15 @@ import asyncRequest from "@/apis/service/sellOut/zixunOrder";
 import resToken from "@/mixins/resToken";
 import { edutRules } from "../columns";
 import baseFormAddEdit from "./baseFormAddEdit";
+import { mapGetters } from "vuex";
+
 export default {
   name: "handover",
   props: ["id", "sitem", "newTime", "type"],
   mixins: [resToken],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   components: {
     baseFormAddEdit,
   },
@@ -809,18 +819,19 @@ export default {
   methods: {
     //乘法精度问题
     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);
+      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)
+      );
     },
 
     async initForm() {
@@ -943,7 +954,7 @@ export default {
             projectNo: projectNo ? [projectNo] : [], //项目编号
             khNo: khNo ? [khNo] : [], //客户编号
             khname: khname || "", //客户名称
-            companyNo: companyNo || "",
+            companyNo: companyNo || this.business_companyNo || "",
             endtime: endtime || "", //咨询截止时间
             platform_code: platform_code || "", //平台id
             puse_desc: "",
@@ -1359,7 +1370,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.lsac{
+.lsac {
   font-weight: bold;
   font-size: 14px;
   // position: absolute;

+ 5 - 1
src/views/serviceParam/storeSet/addEdit.vue

@@ -256,10 +256,14 @@ import {
   isEmoticon,
   validAlphabets,
 } from "@/utils/validate";
+import { mapGetters } from "vuex";
 export default {
   name: "storeSet",
   props: ["showModel", "id", "isDetail"],
   mixins: [resToken],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   data() {
     const validatemobile = (rule, value, callback) => {
       if (value === "") {
@@ -517,7 +521,7 @@ export default {
         this.supplier_name = supplier_name;
         this.accountNames = contactor_name;
         this.ruleForm = {
-          companyNo: companyNo || "",
+          companyNo: companyNo || this.business_companyNo || "",
           name: name, // 仓库名称
           supplierNo: [supplierNo], //供应商编码
           wsmtype: wsm_type || "", //仓库类型 目前随便填

+ 5 - 2
src/views/stock/check/components/addEdit.vue

@@ -96,11 +96,14 @@
    <script>
 import asyncRequest from "@/apis/service/stock/check/detail";
 import resToken from "@/mixins/resToken";
-
+import { mapGetters } from "vuex";
 import columns from "./columns";
 export default {
   name: "addEdit",
   props: ["id", "sitem", "newTime"],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   mixins: [resToken],
   computed: {
     powers() {
@@ -235,7 +238,7 @@ export default {
           this.companyCode = code || "";
           this.companyName = name || "";
           this.ruleForm = {
-            companyNo: companyNo || "",
+            companyNo: companyNo || this.business_companyNo || "",
             wsm_code: wsm_code ? [wsm_code] : [],
             type: type || "2",
             wsm_supplier: this.companyCode ? [this.companyCode] : [],