Merge branch 'sit'

src/apis/service/goodStore/dealGoodsPool/index.js

@@ -4,6 +4,7 @@ const api = "admin/";
 export default {
   // 分页查询
   list: (data, params) => http(api + "zixunlist", data, "post", params),
-
+  // 添加
+  online_add: (data, params) => http(api + "gooduponlinezixun", data, "post", params),
 
 };

src/apis/service/reportQuery/purchaseReport/index.js

@@ -13,6 +13,15 @@ export default {
   // 更新
   update: (data, params) => http(api + "cgdedit", data, "post", params),
   
-   //导出
-   exportcgdlist: (data, params) => http(api + "exportcgdlist", data, "post", params),
+   //咨询单总数
+   reportzixuntotal: (data, params) => http(api + "reportzixuntotal", data, "post", params),
+   //采购订单总金额
+   reportpurcheaseordersum: (data, params) => http(api + "reportpurcheaseordersum", data, "post", params),
+   //采购员回复咨询单数
+   reportconsultbidssum: (data, params) => http(api + "reportconsultbidssum", data, "post", params),
+   //采购员订单金额
+   reportpurcheaseordersumbyuser: (data, params) => http(api + "reportpurcheaseordersumbyuser", data, "post", params),
+   //已采反报价信息
+   reportconsultinfobidssum: (data, params) => http(api + "reportconsultinfobidssum", data, "post", params),
+   
 };

src/config/env.development.js

@@ -7,10 +7,10 @@ module.exports = {
     // userApi: 'http://www.invoice.com/',
     // baseApi: 'http://www.stock.com/',
 
-    userApi: 'http://inv.test241.wanyuhengtong.com/',
-    baseApi: 'http://stock.test241.wanyuhengtong.com/',
-    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
-    // baseApi: 'http://stock.api.wanyuhengtong.com/',
+    // userApi: 'http://inv.test241.wanyuhengtong.com/',
+    // baseApi: 'http://stock.test241.wanyuhengtong.com/',
+    userApi: 'http://inv.sitw.wanyuhengtong.com/',
+    baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
   webUrl:'http://share.sitw.wanyuhengtong.com/#/test-good-share?id=',
   fileURL: `https://api2.edusit.zretchome.com`,

src/utils/validate.js

@@ -184,7 +184,7 @@ export function isWeixin(s) {
  * qq号
  * @param {*} s
  */
- export function isQQ(s) {
+export function isQQ(s) {
   return /^[1-9][0-9]{4,14}$/.test(s)
 }
 
@@ -341,3 +341,43 @@ export function isCreditCode(s) {
   return reg.test(s)
 }
 
+
+
+
+
+export function add_sum(arg1, arg2) {
+  var r1, r2, m;
+  try {
+    r1 = arg1.toString().split(".")[1].length;
+  } catch (e) {
+    r1 = 0;
+  }
+
+  try {
+    r2 = arg2.toString().split(".")[1].length;
+  } catch (e) {
+    r2 = 0;
+  }
+
+  m = Math.pow(10, Math.max(r1, r2));
+
+  return (accMul(arg1, m) + accMul(arg2, m)) / m;
+}
+export function 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)
+  );
+}

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -0,0 +1,321 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    :title="'添加商品上线'"
+    :center="true"
+    align="left"
+    top="8vh"
+    width="1040px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
+  >
+    <el-card style="margin: -20px 0 0 0; padding-bottom: 0">
+      <el-row :gutter="10">
+        <el-col :span="24" style="padding: 0 0 15px 0">
+          <el-table
+            :data="sitem"
+            stripe
+            :size="'mini'"
+            border
+            max-height="380px"
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="spuCode"
+              label="编号"
+              width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="good_img"
+              label="图片"
+              width="45"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <div
+                  v-if="scope.row.good_img"
+                  style="width: 20px; height: 20px"
+                  class="hover"
+                  v-viewer
+                >
+                  <img
+                    :src="scope.row.good_img"
+                    style="display: inline-block; width: 100%; height: 100%"
+                    alt=""
+                  />
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="good_name"
+              label="名称"
+              min-width="160px"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="cat_name"
+              label="分类"
+              min-width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="brand_name"
+              label="品牌"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="good_type"
+              label="定制"
+              width="50"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-tag
+                  :size="'mini'"
+                  :type="scope.row.good_type == '1' ? '' : 'warning'"
+                  v-text="
+                    (options1.find((item) => item.id == scope.row.status) || {})
+                      .name || '--'
+                  "
+                ></el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="supplierNo"
+              label="供应商编号"
+              width="110"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="supplier_name"
+              label="供应商名称"
+              width="110"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="companyNo"
+              label="业务公司编号"
+              width="110"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="company"
+              label="业务公司名称"
+              width="110"
+              show-overflow-tooltip
+            />
+          </el-table>
+        </el-col>
+        <el-col :span="24">
+          <el-form
+            ref="ruleForm"
+            :model="ruleForm"
+            status-icon
+            :rules="rulesThis"
+            label-width="80px"
+            class="demo-ruleForm"
+          >
+            <el-row style="padding-bottom">
+              <el-col :span="8">
+                <el-form-item label="所属平台" prop="platform">
+                  <search-terrace
+                    :value="ruleForm.platform"
+                    :disabled="false"
+                    :isDetail="false"
+                    :placeholder="'所属平台'"
+                    @searchChange="platform_codesearchChange"
+                  />
+                </el-form-item>
+                <el-form-item label="上线原因" prop="online_reason">
+                  <el-input
+                    :disabled="false"
+                    placeholder="上线原因"
+                    v-model="ruleForm.online_reason"
+                    maxlength="200"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="16" style="text-align: right">
+                <el-form-item label="上线备注" prop="online_remark">
+                  <el-input
+                    type="textarea"
+                    :rows="3"
+                    :disabled="false"
+                    placeholder="商品备注"
+                    maxlength="2000"
+                    show-word-limit
+                    v-model="ruleForm.online_remark"
+                  />
+                </el-form-item>
+                <el-button
+                  v-if="id !== '007'"
+                  type="primary"
+                  :size="'mini'"
+                  @click="submitForm"
+                  >保 存
+                </el-button>
+                <el-button :size="'mini'" @click="showModelThis = false">{{
+                  id == "007" ? "关 闭" : "取 消"
+                }}</el-button>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import asyncRequest from "@/apis/service/goodStore/dealGoodsPool";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "brand",
+  props: ["showModel", "id", "sitem"],
+  mixins: [resToken],
+  data() {
+    return {
+      loading: false,
+      showModelThis: this.showModel,
+      ruleForm: {
+        platform: "", //string	平台id
+        online_reason: "", //string	上线原因
+        online_remark: "", //string	上线备注
+      },
+      //是否定制
+      options1: [
+        { id: "0", name: "否" },
+        { id: "1", name: "是" },
+      ],
+      rulesThis: this.rules,
+      rules: {
+        platform: [
+          {
+            required: true,
+            message: "请选择所属平台",
+            trigger: "change",
+          },
+        ],
+        online_reason: [
+          {
+            required: true,
+            message: "上线原因不能为空",
+            trigger: "blur",
+          },
+        ],
+        online_remark: [
+          {
+            required: true,
+            message: "上线备注不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    showModel: function (val) {
+      this.showModelThis = val;
+      if (val) {
+        this.initForm();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      this.rulesThis = this.rules;
+      await this.resetForm();
+      this.loading = false;
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.ruleForm = {
+            platform: "", //string	平台id
+            online_reason: "", //string	上线原因
+            online_remark: "", //string	上线备注
+          };
+        }
+      });
+    },
+    platform_codesearchChange(e) {
+      const { id, code, label } = e;
+      this.ruleForm.platform = id || "";
+      this.$refs.ruleForm.validateField("platform");
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          // model.platform = model.platform.toString();
+          model.codes = [];
+          let list = JSON.parse(JSON.stringify(this.sitem));
+          list.forEach((e) => {
+            model.codes.push(e.spuCode);
+          });
+          let { code, data, message } = await asyncRequest.online_add(model);
+          this.loading = false;
+          if (code === 0) {
+            this.$notify.success({
+              title: "已成功添加至上线流程！",
+              message: "",
+            });
+            this.showModelThis = false;
+            // 刷新
+            this.$emit("refresh");
+          } else if (code >= 100 && code <= 104) {
+            await this.logout();
+          } else if (code === 1009) {
+            let resList = JSON.parse(JSON.stringify(data));
+
+            let htmlList = "<ul>";
+            resList.forEach((v) => {
+              htmlList += `<li>
+          <img src='${v.good_img}' style='width: 20px; height: 20px'
+                  class='hover'
+                  v-viewer/>
+                  <span>${v.good_name}__</span>`;
+              const { speclist } = v;
+              let str = "<span>";
+              speclist.forEach((a, ai) => {
+                str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${a.spec_value}]`;
+              });
+              htmlList += str + "</span>" + `</li>`;
+            });
+            htmlList += "</ul>";
+            this.$notify({
+              title: "一下商品已上线或已经在审批流程中！",
+              dangerouslyUseHTMLString: true,
+              message: htmlList,
+            });
+          } else {
+            this.$message.warning(message);
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+
+   <style lang="scss" scoped>
+.brand {
+}
+</style>

src/views/goodStore/dealGoodsPool/index.vue

@@ -57,15 +57,14 @@
               :span="3"
               class="fr"
               style="width: 110px; padding: 0 0 0 10px"
+              v-if="powers.some((item) => item == '055')"
              
             >
-              <!-- v-if="powers.some((item) => item == '055')" -->
               <el-button
                 :size="searchSize"
                 type="warning"
                 style="float: right"
                 @click="add_online"
-                 
               >
                 <i class="el-icon-circle-plus-outline"></i>
                 <span>商品上线</span>
@@ -178,14 +177,14 @@
       @cancel="visible = false"
     />
 
-    <el-dialog
-        title="弹窗"
-        :visible.sync="centerDialogVisible"
-        width="30%"
-        center
-      >
-        <span>暂无</span>
-      </el-dialog>
+     <add-edit
+      :id="''"
+      :sitem="changeList"
+      :show-model="showModel"
+      :is-detail="false"
+      @refresh="showModel = false,searchList()"
+      @cancel="showModel = false"
+    />
   </div>
 </template>
 <script>
@@ -195,11 +194,13 @@ import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 import { listCol, options1 } from "./columns";
 import showGoodsDataTableModal from "@/components/show-goods-data-table-modal";
+import addEdit from "./addEdit";
 export default {
   name: "dealGoodsPool",
   mixins: [mixinPage, resToken],
   components: {
     showGoodsDataTableModal,
+    addEdit
   },
   computed: {
     //组件SIZE设置
@@ -223,7 +224,7 @@ export default {
       select: "1",
       sinput: "",
       //弹窗
-      centerDialogVisible:false,
+      showModel:false,
       //选中数组
       changeList:[],
       statusList: [
@@ -286,7 +287,15 @@ export default {
   methods: {
     //点击商品上线
     add_online(){
-      this.centerDialogVisible = true;
+       if (this.changeList.length === 0) {
+        this.$message.warning("至少选择一个商品！");
+        return;
+      }
+       if (this.changeList.length >100) {
+        this.$message.warning("商品数量不能超过100！");
+        return;
+      }
+      this.showModel = true;
     },
     //选中触发函数
     selection_change(e) {

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1882,7 +1882,11 @@ export default {
             good_thumb_img: good_thumb_img || "",
             good_img: good_img ? (good_img || "").split(",") : [],
             good_info_img: good_info_img
-              ? (good_info_img || "").split(",")
+              ? (Object.prototype.toString.call(good_info_img) ===
+                "[object Array]"
+                  ? ""
+                  : good_info_img || ""
+                ).split(",")
               : [],
             //固定阶梯成本
             demo_fee: demo_fee || "",

src/views/goodStore/goodsCost/index.vue

@@ -229,7 +229,7 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')"
+          v-if="powers.some((item) => item == '007')&&(scope.row.status !== '8')"
           effect="dark"
           content="详情"
           placement="top"
@@ -248,7 +248,9 @@
           v-if="
             (powers.some((item) => item == '005') &&
               scope.row.status === '7') ||
-            (powers.some((item) => item == '005') && scope.row.status === '6')
+            (powers.some((item) => item == '005') && scope.row.status === '6')||
+            (powers.some((item) => item == '005') && scope.row.status === '8')
+         
           "
           effect="dark"
           content="修改"

src/views/orderEntry/orderConfirm/index.vue

@@ -347,7 +347,7 @@
                         </template>
                         <template slot="cat_info">
                           <span
-                            v-for="(si, sii) in conGoodData.cat_info"
+                            v-for="(si, sii) in subGoodData.cat_info"
                             :key="si + sii"
                             >{{ sii === 0 ? "" : "_" }}{{ si.name }}</span
                           >

src/views/purchaseIn/purchaseDiffOrder/columns.js

@@ -24,10 +24,10 @@ export default [
           prop: "good_name",
           label: "商品名称",
         },
-        {
-          prop: "class_cat",
-          label: "商品分类",
-        },
+        // {
+        //   prop: "class_cat",
+        //   label: "商品分类",
+        // },
 
         {
           prop: "good_weight",

src/views/purchaseIn/workbench/components/baseForm.vue

@@ -14,28 +14,26 @@
         :span="24"
         style="padding: 12px 16px 12px 16px; text-align: right"
       >
-      <!-- 贵金属重量*供应商采购金价 + 工艺费*贵金属重量+加标费+包装费+证书费+成本裸价+运费+其他费用=成本合计 -->
-      <!-- 贵金属重量*供应商采购金价 + 工艺费*贵金属重量+加标费+包装费+证书费+成本裸价+运费=成本合计 -->
-      <!-- ps:没有其他费用-->  
-      <!-- （ruleForm.noble_weight*newGoldPrice)+ （ruleForm.cost_fee*ruleForm.noble_weight）
+        <!-- $total_fee(成本合计初始价格) =打样费/购买数量 + 开模费/购买数量 + 金属重量* 最新金价 + 工艺费* 金属重量+包装费+加标费+证书费+产品裸价0+运费; -->
+        <!-- ps:没有其他费用-->
+        <!-- （ruleForm.noble_weight*newGoldPrice)+ （ruleForm.cost_fee*ruleForm.noble_weight）
       + ruleForm.mark_fee + ruleForm.pakge_fee + ruleForm.cert_fee + ruleForm.nake_fee + ruleForm.delivery_fee-->
-      <!-- 乘法精度函数调用在mounted（初始调用），number_change函数（改变调用），如果放在dom层初始值时undifind会报错  r1,r2-->
-        <span
-          > 成本合计：<span>
-           
-            {{ 
-              accAdd(
-                r1,
-                r2,
-                ruleForm.mark_fee,
-                ruleForm.pakge_fee,
-                ruleForm.cert_fee,
-                ruleForm.nake_fee,
-                ruleForm.delivery_fee,
-                )
-            }}
-           <!-- {{ruleForm.delivery_fee}} -->
-            </span></span
+        <!-- 乘法精度函数调用在mounted（初始调用），number_change函数（改变调用），如果放在dom层初始值时undifind会报错  r1,r2-->
+        <span>
+          <!-- {{
+          (ruleForm.demo_fee/askItem.num)+
+          (ruleForm.open_fee/askItem.num)+
+          (ruleForm.noble_weight*newGoldPrice)+
+          (ruleForm.cost_fee*ruleForm.noble_weight)+
+          ruleForm.pakge_fee+
+          ruleForm.mark_fee+
+          ruleForm.cert_fee+ruleForm.nake_fee+ruleForm.delivery_fee 
+
+          }} -->
+          预计成本合计：<span>
+            
+            {{newPrice}}
+          </span></span
         >
         <span
           class="fl"
@@ -479,7 +477,7 @@
             <search-metal-kind
               :value="ruleForm.metal_id"
               :size="'mini'"
-              :disabled="false"
+              :disabled="type === 'view'"
               :isDetail="true"
               :placeholder="'金属种类'"
               @searchChange="metal_idsearchChange"
@@ -631,7 +629,7 @@ import {
 export default {
   name: "goodsCostAdd",
   mixins: [resToken],
-  props: ["showModel", "id", "type", "sitem", "askItem", "newTime", "editId",],
+  props: ["showModel", "id", "type", "sitem", "askItem", "newTime", "editId"],
   components: {
     baseFormAddEdit,
   },
@@ -674,7 +672,7 @@ export default {
       loading: true,
 
       //新实时金价
-      newGoldPrice:0,
+      newGoldPrice: 0,
 
       options1: options1,
       options2: options2,
@@ -689,91 +687,125 @@ export default {
       options11: options11,
       ruleForm: {},
       rules: JSON.parse(JSON.stringify(rules)),
-      r1:"",
-      r2:"",
+      //乘法处理
+      r1: "",
+      r2: "",
+      //除法处理
+      r3: "",
+      r4: "",
+
+      //成本合算
+      newPrice:0,
     };
   },
   mounted() {
+    this.$nextTick(() => {});
     this.initForm();
-
-    this.computedCost()
-   
     
+    
+    // this.computedCost();
   },
   methods: {
     //加法精度问题
-//     accAdd(arg1,arg2){ 
-//     var r1,r2,m; 
-//     try{
-//     	r1=arg1.toString().split(".")[1].length;
-//     }catch(e){
-//     	r1=0;
-//     } 
-//     try{
-//     	r2=arg2.toString().split(".")[1].length;
-//     }catch(e){
-//     	r2=0;
-//     } 
-//     m=Math.pow(10,Math.max(r1,r2)) ;
-//     return (arg1*m+arg2*m)/m ;
-// },
-accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){ 
-    var r1,r2,r3,r4,r5,r6,r7,m; 
-    console.log(arg1,arg2,arg3,arg4,arg5,arg6,arg7)
-    try{
-    	r1=arg1.toString().split(".")[1].length;
-    }catch(e){
-    	r1=0;
-    } 
-    try{
-    	r2=arg2.toString().split(".")[1].length;
-    }catch(e){
-    	r2=0;
-    }
-    try{
-    	r3=arg3.toString().split(".")[1].length;
-    }catch(e){
-    	r3=0;
-    }  
-    try{
-    	r4=arg4.toString().split(".")[1].length;
-    }catch(e){
-    	r4=0;
-    } 
-    try{
-    	r5=arg5.toString().split(".")[1].length;
-    }catch(e){
-    	r5=0;
-    } 
-    try{
-    	r6=arg6.toString().split(".")[1].length;
-    }catch(e){
-    	r6=0;
-    } 
-    try{
-    	r7=arg7.toString().split(".")[1].length;
-    }catch(e){
-    	r7=0;
-    } 
-    m=Math.pow(10,Math.max(r1,r2,r3,r4,r5,r6,r7)) ;
-    return (arg1*m+arg2*m+arg3*m+arg4*m+arg5*m+arg6*m+arg7*m)/m ;
-},
+    accAdd(arg1, arg2) {
+      var r1, r2, m;
+      try {
+        r1 = arg1.toString().split(".")[1].length;
+      } catch (e) {
+        r1 = 0;
+      }
+      try {
+        r2 = arg2.toString().split(".")[1].length;
+      } catch (e) {
+        r2 = 0;
+      }
+      m = Math.pow(10, Math.max(r1, r2));
+      return (arg1 * m + arg2 * m) / m;
+    },
+    // accAdd(arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
+    //   var r1, r2, r3, r4, r5, r6, r7, m;
+    //   console.log(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    //   try {
+    //     r1 = arg1.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r1 = 0;
+    //   }
+    //   try {
+    //     r2 = arg2.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r2 = 0;
+    //   }
+    //   try {
+    //     r3 = arg3.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r3 = 0;
+    //   }
+    //   try {
+    //     r4 = arg4.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r4 = 0;
+    //   }
+    //   try {
+    //     r5 = arg5.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r5 = 0;
+    //   }
+    //   try {
+    //     r6 = arg6.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r6 = 0;
+    //   }
+    //   try {
+    //     r7 = arg7.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r7 = 0;
+    //   }
+    //   m = Math.pow(10, Math.max(r1, r2, r3, r4, r5, r6, r7));
+    //   return (
+    //     (arg1 * m +
+    //       arg2 * m +
+    //       arg3 * m +
+    //       arg4 * m +
+    //       arg5 * m +
+    //       arg6 * m +
+    //       arg7 * m) /
+    //     m
+    //   );
+    // },
 
-     //乘法精度问题
+    //乘法精度问题
     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) {
-        }
-        let numStr = Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m);
-        return numStr.toString()
+      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) {}
+      let numStr =
+        (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) /
+        Math.pow(10, m);
+      return numStr.toString();
+    },
+    //除法精度问题
+    accDiv(arg1, arg2) {
+      var t1 = 0,
+        t2 = 0,
+        c1,
+        c2;
+      try {
+        t1 = arg1.toString().split(".")[1].length;
+      } catch (e) {}
+      try {
+        t2 = arg2.toString().split(".")[1].length;
+      } catch (e) {}
+      // with (Math) {
+      c1 = Number(arg1.toString().replace(".", ""));
+      c2 = Number(arg2.toString().replace(".", ""));
+      return (c1 / c2) * Math.pow(10, t2 - t1);
+      // }
     },
     async initForm() {
       this.supplierNo = [];
@@ -794,23 +826,68 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
       if (this.type === "edit" || this.type === "view") {
         await this.initData();
       }
+      //调用实时金价获取接口
+        
+        this.golpricelast(this.ruleForm.metal_id)
+        //调用成本合算计算函数
+        // this.computedCost()
       this.setrules();
       this.loading = false;
     },
 
-    computedCost(){
-      let goldPrice = this.newGoldPrice || this.askItem.gold_price
-      this.$nextTick(()=>{
-        this.r1 = this.accMul(this.ruleForm.noble_weight,goldPrice)
-        this.r2 = this.accMul(this.ruleForm.cost_fee,this.ruleForm.noble_weight)
-    })
+    computedCost() {
+      //        (this.ruleForm.demo_fee/this.askItem.num)+
+      //       (this.ruleForm.open_fee/this.askItem.num)+
+      //       (this.ruleForm.noble_weight*this.newGoldPrice)+
+      //       (this.ruleForm.cost_fee*this.ruleForm.noble_weight)+
+      //       this.ruleForm.pakge_fee+
+      //       this.ruleForm.mark_fee+
+      //       this.ruleForm.cert_fee+this.ruleForm.nake_fee+this.ruleForm.delivery_fee
+
+      //  let price = this.accDiv(this.ruleForm.demo_fee,this.askItem.num)
+      //  let price = this.accDiv(this.ruleForm.open_fee,this.askItem.num)
+
+      // console.log(this.askItem.num)
+      
+      this.$nextTick(() => {
+        this.r1 = this.accMul(this.ruleForm.noble_weight, this.newGoldPrice);
+        this.r2 = this.accMul(
+          this.ruleForm.cost_fee,
+          this.ruleForm.noble_weight
+        );
+        this.r3 = this.accDiv(this.ruleForm.demo_fee, this.askItem.num);
+        this.r4 = this.accDiv(this.ruleForm.open_fee, this.askItem.num);
+
+        // this.accAdd(this.r1,this.r2)
+        // this.accAdd(this.r3,this.r4)
+        // this.accAdd(this.ruleForm.pakge_fee,this.ruleForm.mark_fee)
+        // this.accAdd(this.ruleForm.cert_fee,this.ruleForm.nake_fee)
+        // this.accAdd(this.ruleForm.delivery_fee,)
+
+       let price =  this.accAdd(
+            this.ruleForm.delivery_fee,
+            this.accAdd(
+              this.accAdd(
+                this.accAdd(
+                  this.accAdd(this.r1, this.r2),
+                  this.accAdd(this.r3, this.r4)
+                ),
+                this.accAdd(this.ruleForm.pakge_fee, this.ruleForm.mark_fee)
+              ),
+              this.accAdd(this.ruleForm.cert_fee, this.ruleForm.nake_fee)
+            )
+          );
+          price = price.toFixed(2)
+
+          this.newPrice = price;
+          console.log("aaaaaaaaaaaaaaaaaaa",price)
+      });
     },
 
     number_change(e, key) {
       this.ruleForm[key] = e + "" || "0";
       this.$refs.ruleForm.validateField(key);
-      this.computedCost()
-      
+      this.computedCost();
     },
     async initData() {
       this.loading = true;
@@ -916,7 +993,8 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
         if (this.is_noble) {
           this.ruleForm.nake_fee = "0";
         }
-        // console.log(this.ruleForm.origin_place);
+        
+        
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -992,9 +1070,9 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
           this.is_noble = this.askItem.is_metal;
           this.cat_id_name = this.type === "add" ? this.askItem.can_name : "";
 
-          this.brand_name =""
+          this.brand_name = "";
           // this.type === "add" ? this.askItem.brand : "";
-          this.unit_name = ""
+          this.unit_name = "";
           //this.type === "add" ? this.askItem.unit_name : "";
           this.ruleForm = {
             infoNo: this.id || "",
@@ -1004,10 +1082,10 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
             expire_day: "0", //有效期
             delivery_day: "0", //物流时间
             work_day: "0", //生产工期
-            brandid:[],
-              // this.type === "add" && this.askItem.brand_id
-              //   ? [this.askItem.brand_id]
-              //   : [],
+            brandid: [],
+            // this.type === "add" && this.askItem.brand_id
+            //   ? [this.askItem.brand_id]
+            //   : [],
             unit_id: [],
             //this.type === "add" ? [this.askItem.unit] : [],
             weight: this.type === "add" ? this.askItem.total_weight : "0.000",
@@ -1134,16 +1212,8 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
     },
     //金属种类选择
     //需修改，未改完
-   async metal_idsearchChange(e) {
-
-      // console.log(e.id,"1111111111111111111111")
-      if(!e.id){
-        // this.ruleForm.metal_id = this.askItem.gold_price;
-      // console.log(this.ruleForm.metal_id ,"1111111111111111111111")
-
-        this.newGoldPrice = 0;
-        return;
-      }
+    async metal_idsearchChange(e) {
+      
       this.loading = true;
       const { id, code, label } = e;
       if (id) {
@@ -1152,19 +1222,39 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
         this.ruleForm.metal_id = "";
       }
       this.$refs.ruleForm.validateField("metal_id");
+      
 
+      //获取实时金价
+      this.golpricelast(e.id)
+      
+      this.loading = false;
+    },
+    //获取实时金价
+    async golpricelast(id){
       
-      const res = await asyncRequest.golpricelast({type:e.id});
-      if (res && res.code === 0) { 
-        this.newGoldPrice = res.data[0].price;
-        this.computedCost()
-        console.log(res.data[0].price)
+      if (!id) {
+        // this.ruleForm.metal_id = this.askItem.gold_price;
+        // console.log(this.ruleForm.metal_id ,"1111111111111111111111")
+        
+        this.newGoldPrice = 0;
+        return;
+      }
+      const res = await asyncRequest.golpricelast({ type: id });
+      console.log(res)
+      if (res && res.code === 0) {
+        if(res.data.length<=0){
+          this.newGoldPrice = 0;
+        }else{
+          this.newGoldPrice = res.data[0].price;
+        }
+        
+
+        this.computedCost();
+        
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
-        
       }
-      this.loading = false;
     },
 
     //仓库省市区

src/views/reportQuery/purchaseReport/components/columns.js

@@ -169,77 +169,77 @@ const table5 = [
     _noset_: true
   },
   {
-    prop: "date",
+    prop: "addtime",
     label: "咨询时间",
     width: "145px",
   },
   {
-    prop: "name",
+    prop: "bidNo",
     label: "采购反馈单号",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "zxNo",
     label: "咨询订单号",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "cbaddtime",
     label: "回复时间",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "good_name",
     label: "产品名称",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "supplier",
     label: "供应商名称",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "total_fee",
     label: "成本合计",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "delivery_day",
     label: "物流时间（天）",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "work_day",
     label: "产品工期（天）",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "expire_day",
     label: "信息有效期（天）",
     width: "155px",
   },
   {
-    prop: "total",
+    prop: "creater",
     label: "采购员",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "num",
     label: "需求数量",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "arrival_time",
     label: "要求到货日期",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "salesman",
     label: "业务人员",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "companyName",
     label: "客户名称",
     width: "145px",
   },

src/views/reportQuery/purchaseReport/components/table14.vue

@@ -25,7 +25,7 @@
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
              
-               <el-col :span="6" style="width: 403px;">
+               <el-col :span="6" style="width: 383px;">
                 <periodDatePickerActive
                       :start="parmValue.start_date"
                       :end="parmValue.end_date"
@@ -35,6 +35,29 @@
                       @timeReturned="time"
                     />
               </el-col>  
+              <el-col :span="6" style="width: 150px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.select"
+                  filterable
+                  clearable
+                  placeholder="出入库类型"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option label="假的" value="1"></el-option>
+                    <el-option label="假的" value="2"></el-option>
+                    <el-option label="假的" value="3"></el-option>
+                    <el-option label="假的" value="4"></el-option>
+                    <el-option label="假的" value="5"></el-option>
+                    <el-option label="假的" value="6"></el-option>
+                    <el-option label="假的" value="7"></el-option>
+                </el-select>
+              </el-col>
               <el-col :span="4" style="width: 66px; float: right">       
                 <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
                     导出
@@ -56,7 +79,7 @@
               <el-col :span="6" style="width: 240px">
                 <el-input
                   clearable
-                  placeholder="采购维护人"
+                  placeholder="产品名称"
                   v-model="parmValue.xiugai1"
                   maxlength="40"
                   :size="searchSize"
@@ -71,7 +94,7 @@
               <el-col :span="6" style="width: 240px">
                 <el-input
                   clearable
-                  placeholder="供应商名称"
+                  placeholder="产品编码"
                   v-model="parmValue.xiugai2"
                   maxlength="40"
                   :size="searchSize"
@@ -132,6 +155,7 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
+          select:"",
         xiugai1:"", //咨询订单号
         xiugai2:"",
         start_date: "", //起始时间

src/views/reportQuery/purchaseReport/components/table5.vue

@@ -57,7 +57,7 @@
                 <el-input
                   clearable
                   placeholder="咨询订单号"
-                  v-model="parmValue.xiugai1"
+                  v-model="parmValue.zxNo"
                   maxlength="40"
                   :size="searchSize"
                   @blur="
@@ -118,11 +118,12 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
-        xiugai1:"", //咨询订单号
+        zxNo:"", //咨询订单号
         start_date: "", //起始时间
         end_date: "", // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_export:0//是否导出
        
       },
       // 表格 - 数据集合
@@ -158,13 +159,14 @@ export default {
         this.$message.warning("时间区间不完整！");
         return;
       }
-      return;
+      // return;
       this.loading = true;
       
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.reportconsultinfobidssum(this.parmValue);
       if (res && res.code === 0 && res.data) {
+        console.log(res)
         this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
+        this.pageInfo.total = Number(res.data.total);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
@@ -177,10 +179,12 @@ export default {
     //重置
     restSearch() {
       this.parmValue = {
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
+        zxNo:"", //咨询订单号
+        start_date: "", //起始时间
+        end_date: "", // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_export:0//是否导出
       };
       // 表格 - 分页
       this.pageInfo = {

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

@@ -183,6 +183,7 @@
 <script>
 import asyncRequest from "@/apis/service/sellOut/bargainList";
 import resToken from "@/mixins/resToken";
+import { add_sum, accMul } from "@/utils/validate";
 export default {
   name: "Account",
   props: ["showModel", "sitem"],
@@ -314,8 +315,20 @@ export default {
           // this.loading = true;
           const { bidNo, sale_price, is_gold_price, can, sale_cost_fee } =
             this.sitem;
-          // const { bargain_price, result_info_id, bargain_remark, cost_price } =
-          //   JSON.parse(JSON.stringify(this.ruleForm));
+          const { bargain_price, cost_price } = this.ruleForm;
+          let a = add_sum(sale_price + "", "0");
+          let b = add_sum(bargain_price + "", "0");
+          if (b > a) {
+            this.$message.warning("期望售价不能高于当前售价");
+            return;
+          }
+
+          let c = add_sum(sale_cost_fee + "", "0");
+          let d = add_sum(cost_price + "", "0");
+          if (d > c) {
+            this.$message.warning("期望工艺费不能高于当前工艺费");
+            return;
+          }
 
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           console.log(model);
@@ -328,8 +341,16 @@ export default {
             can.length > 0 &&
             can[0].id + "" == "6"
           ) {
+            if (c === d) {
+              this.$message.warning("期望工艺费不能等于当前工艺费!");
+              return;
+            }
             model.bargain_price = "0";
           } else {
+            if (a === b) {
+              this.$message.warning("期望售价不能等于当前售价!");
+              return;
+            }
             model.cost_price = "0";
           }
 

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

@@ -597,9 +597,8 @@ export default {
       id: "",
     };
   },
-  created(){
-
-      // this.this.ruleForm.arrtime = this.sitem.in_arrival_time.substring(0, 10);
+  created() {
+    // this.this.ruleForm.arrtime = this.sitem.in_arrival_time.substring(0, 10);
   },
   watch: {
     showModel: function (val) {
@@ -795,13 +794,13 @@ export default {
               this.loading = false;
               return;
             }
-            if (parseInt(good_num + "") !== addrT && sendtype === "2") {
+            if (parseInt(good_num + "") !== addrT) {
               this.$message.warning("收货总数量与购买不一致！");
               this.loading = false;
               return;
             }
           }
-          console.log(model);
+           this.loading = false
           let res = await asyncRequest.consultorder(model);
           this.loading = false;
           if (res && res.code === 0) {

src/views/stock/check/components/resultUplod.vue

@@ -9,8 +9,8 @@
       style="width: 100%"
     >
       <el-table-column
-        prop="good_type_code"
-        label="商品属性编号"
+        prop="spuCode"
+        label="商品编号"
         min-width="130"
       />
       <el-table-column prop="good_name" label="商品名称" min-width="200" />

src/views/stock/check/components/resultUplodModel.vue

@@ -56,9 +56,9 @@
 </template>
 <script>
 import urlConfig from "@/apis/url-config";
-import { getToken } from "@/utils/auth";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/stock/check/detail";
+import { isnumber } from "@/utils/validate";
 export default {
   name: "resultUplodModel",
   props: ["showModel", "id"],
@@ -72,7 +72,7 @@ export default {
       isfile: false,
       head: [
         "商品编码",
-        "商品属性编码",
+        // "商品属性编码",
         "商品名称",
         "商品描述",
         "品牌",
@@ -118,7 +118,6 @@ export default {
     },
   },
   methods: {
-    
     async initForm() {
       this.loading = true;
       this.isfile = false;
@@ -178,9 +177,39 @@ export default {
     async submitForm() {
       if (!this.loading) {
         this.loading = true;
+        let isok = true,
+          isn = true,
+          list = [];
+        this.tableData.forEach((v) => {
+          if (v.value14 === "") {
+            isok = false;
+          }
+        });
+        if (!isok) {
+          this.$message.warning("盘点库存不能为空！");
+          this.loading = false;
+          return;
+        }
+        this.tableData.forEach((v) => {
+          list.push({
+            value0: v.value0,
+            value1: v.value1,
+            // value2: v.value2,
+            value14: v.value14+"",
+          });
+          if (!isnumber(v.value14)) {
+            isn = false;
+          }
+        });
+        if (!isn) {
+          this.$message.warning("盘点库存只能为正整数！");
+          this.loading = false;
+          return;
+        }
+
         let model = {
           id: this.id,
-          data: this.tableData,
+          data: list,
         };
         const res = await asyncRequest.checkimport(model);
         this.loading = false;

src/views/stock/stockCount/components/productWeido/columns.js

@@ -42,7 +42,7 @@ export default [
     width: "50",
   },
   {
-    prop: "usable_stock",
+    prop: "total_stock",
     label: "当前库存",
     width: "80",
   },
@@ -56,14 +56,15 @@ export default [
     label: "待出库",
     width: "80",
   },
+  {
+    prop: "usable_stock",
+    label: "可用库存",
+    width: "80",
+  },
   {
     prop: "intra_stock",
     label: "在途库存",
     width: "80",
   },
-  // {
-  //   prop: "intra_stock",
-  //   label: "预警库存",
-  //   width: "80",
-  // },
+
 ]

src/views/stock/stockCount/index.vue

@@ -59,7 +59,7 @@ export default {
   },
   data() {
     return {
-      activeName: "count", //默认选中的区间统计选项
+      activeName: "productWeido", //默认选中的区间统计选项
     };
   },
   methods: {},