x

3c135a39 · 肖康 · 052fc017 · 3c135a39 · 3c135a39
Commit 3c135a39 authored May 20, 2021 by 肖康
Showing with 130 additions and 49 deletions
src/views/Index/index.vue
src/views/List/inquireDetail.vue
--- a/src/views/Index/index.vue
+++ b/src/views/Index/index.vue
@@ -80,7 +80,7 @@
                    <i class="iconfont iconjinzhi1"></i>
                    <p class="t1">待报价</p>
                </div>
-                <span class="color3">{{data.wait_quote_count}}</span>
+                <span class="color3">{{data.weekly_inquiry_ready_count}}</span>
            </li>
            <li class="column boxsiz">
                <div class="wrap">

--- a/src/views/List/inquireDetail.vue
+++ b/src/views/List/inquireDetail.vue
@@ -4,17 +4,22 @@
      <p class="tit">询价信息</p>
      <div class="input-box">
        <span class="p-text">型号</span>
-                <input type="text" placeholder="" disabled :value="inquiry_info.goods_name" style="width: 176px;margin-right: 30px; "/>
+        <input type="text" placeholder="" disabled :value="inquiry_info.goods_name"
+          style="width: 176px;margin-right: 30px; " />
        <span class="p-text">品牌</span>
-                <input type="text" placeholder="" disabled :value="inquiry_info.brand_name" style="width: 100px;margin-right: 30px; "/>
+        <input type="text" placeholder="" disabled :value="inquiry_info.brand_name"
+          style="width: 100px;margin-right: 30px; " />
        <span class="p-text">数量</span>
-                <input type="text" placeholder="" disabled :value="inquiry_info.inquiry_number" style="width: 100px ;margin-right: 30px;"/>
+        <input type="text" placeholder="" disabled :value="inquiry_info.inquiry_number"
+          style="width: 100px ;margin-right: 30px;" />
        <span class="p-text">批次</span>
-                <input type="text" placeholder="" disabled :value="inquiry_info.batch" style="width: 100px;margin-right: 30px; "/>
+        <input type="text" placeholder="" disabled :value="inquiry_info.batch"
+          style="width: 100px;margin-right: 30px; " />
        <span class="p-text">交货日期</span>
-                <input type="text" placeholder="" disabled :value="inquiry_info.delivery_time" style="width: 100px;margin-right: 30px; "/>
+        <input type="text" placeholder="" disabled :value="inquiry_info.delivery_time"
+          style="width: 100px;margin-right: 30px; " />
        <span class="p-text">询价单号</span>
-                <input type="text" placeholder="" disabled :value="inquiry_info.inquiry_sn" style="width: 138px "/>
+        <input type="text" placeholder="" disabled :value="inquiry_info.inquiry_sn" style="width: 138px " />
      </div>
      <p class="text">
        <span>状态：</span>
@@ -74,7 +79,8 @@
    <div class="assistant">
      <i class="ic"></i>
      <ul class="tab row verCenter">
-                <li @click="tab(index)" class="boxsiz row rowCenter verCenter" :class="{'curr':active==index}" v-for="(item,index) in textArr" :key="index">{{item}}</li>
+        <li @click="tab(index)" class="boxsiz row rowCenter verCenter" :class="{'curr':active==index}"
+          v-for="(item,index) in textArr" :key="index">{{item}}</li>
      </ul>
      <div class="data-box th-all">
        <!--匹配库存-->
@@ -137,7 +143,8 @@
              </template>
            </el-table-column>
          </el-table>
-                    <el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
+          <el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total"
+            @current-change="handleCurrentChange" :current-page="page"></el-pagination>
        </template>
        <!--历史报价-->
        <template v-else-if="active==1">
@@ -176,7 +183,8 @@
            <el-table-column prop="expire_time" label="品牌" width="200"></el-table-column>
            <el-table-column prop="inquiry_sn" label="询价单号" width="200"></el-table-column>
          </el-table>
-                    <el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
+          <el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total"
+            @current-change="handleCurrentChange" :current-page="page"></el-pagination>
        </template>
      </div>
    </div>
@@ -187,7 +195,8 @@
          <div class="row bothSide">
            <div class="box">
              <el-form-item label="报价型号" prop="goods_name">
-                                <el-input v-model="ruleForm.goods_name" :disabled="isModify" placeholder="请输入型号" :value="ruleForm.goods_name"></el-input>
+                <el-input v-model="ruleForm.goods_name" :disabled="isModify" placeholder="请输入型号"
+                  :value="ruleForm.goods_name"></el-input>
              </el-form-item>
              <el-form-item label="报价数量" prop="quote_number">
                <el-input v-model="ruleForm.quote_number" placeholder="请输入数量" :value="ruleForm.quote_number"></el-input>
@@ -205,7 +214,8 @@
                <el-input v-model="ruleForm.mpq" placeholder="请输入MPQ" :value="ruleForm.mpq"></el-input>
              </el-form-item>
              <el-form-item label="其他费用" class="updatebox">
-                                <el-input placeholder="" v-model="ruleForm.price_other" placeholder="请输入其他费用" :value="ruleForm.price_other"></el-input>
+                <el-input placeholder="" v-model="ruleForm.price_other" placeholder="请输入其他费用"
+                  :value="ruleForm.price_other"></el-input>
                <div class="selectdw">
                  <el-select v-model="ruleForm.unit" placeholder="RGB" class="placehoload">
                    <el-option label="RGB" value="RGB"></el-option>
@@ -216,18 +226,24 @@
            </div>
            <div class="box">
              <el-form-item label="报价品牌" prop="brand_s">
-                                <el-autocomplete :disabled="isModify" :value="ruleForm.brand" v-model="ruleForm.brand" :trigger-on-focus="true" :fetch-suggestions="querySearchAsync" placeholder="请输入品牌" @select="handleSelectBrandName"></el-autocomplete>
+                <el-autocomplete :disabled="isModify" :value="ruleForm.brand" v-model="ruleForm.brand"
+                  :trigger-on-focus="true" :fetch-suggestions="querySearchAsync" placeholder="请输入品牌"
+                  @select="handleSelectBrandName"></el-autocomplete>
              </el-form-item>
              <el-form-item label="价格" prop="price_origin">
                <el-input v-model="ruleForm.price_origin" placeholder="请输入价格" :value="ruleForm.price_origin"></el-input>
              </el-form-item>
              <el-form-item label="税率">
-                                <el-input disabled v-model="ruleForm.tax_rate" style="width: 100px" :value="ruleForm.tax_rate"></el-input>
+                <el-input disabled v-model="ruleForm.tax_rate" style="width: 100px" :value="ruleForm.tax_rate">
+                </el-input>
              </el-form-item>
              <el-form-item label="货期" prop="delivery_time_val" class="updatebox">
-                                <el-input placeholder="" v-model="ruleForm.delivery_time_val" :value="ruleForm.delivery_time" onkeyup="this.value = this.value.replace(/[^\d]/g,'');" @keyup.native="keyup(ruleForm.delivery_time_val)"></el-input>
+                <el-input placeholder="" v-model="ruleForm.delivery_time_val" :value="ruleForm.delivery_time"
+                  onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
+                  @keyup.native="keyup(ruleForm.delivery_time_val)"></el-input>
                <div class="selectdw">
-                                    <el-select v-model="ruleForm.delivery_time_unit" placeholder="天" class="placehoload" @change="unitChange">
+                  <el-select v-model="ruleForm.delivery_time_unit" placeholder="天" class="placehoload"
+                    @change="unitChange">
                    <el-option label="天" value="天"></el-option>
                    <el-option label="周" value="周"></el-option>
                  </el-select>
@@ -251,13 +267,15 @@
        <el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
      </div>
    </el-dialog>
-        <Menu/>
+    <Menu />
  </section>
 </template>
 <script>
  import Vue from 'vue';
  import Menu from "@/components/menu.vue";
-  import {dateTimeFormate} from "../../filters/formate.js";
+  import {
+    dateTimeFormate
+  } from "../../filters/formate.js";
  import {
    Form,
@@ -281,13 +299,15 @@
    Tooltip
  } from 'element-ui'
-  Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Loading).use(Tooltip);
+  Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Loading)
+    .use(Tooltip);
  Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination);
  export default {
    name: "InquireDetail",
    data() {
      return {
+        currentDataId:0,
        active: 0,
        total: 0,
        limit: 10,
@@ -324,30 +344,45 @@
          remark: ''
        },
        rules: {
-          goods_name: [
+          goods_name: [{
-            {required: true, message: '请输入报价型号', trigger: 'blur'}
+            required: true,
-          ],
+            message: '请输入报价型号',
-          quote_number: [
+            trigger: 'blur'
-            {required: true, message: '请输入报价数量', trigger: 'blur'}
+          }],
-          ],
+          quote_number: [{
-          currency: [
+            required: true,
-            {required: true, message: '请选择币种', trigger: 'blur'}
+            message: '请输入报价数量',
-          ],
+            trigger: 'blur'
-          batch: [
+          }],
-            {required: true, message: '请输入批次', trigger: 'blur'}
+          currency: [{
-          ],
+            required: true,
-          brand: [
+            message: '请选择币种',
-            {required: true, message: '请选择报价品牌'}
+            trigger: 'blur'
-          ],
+          }],
-          price_origin: [
+          batch: [{
-            {required: true, message: '请输入价格', trigger: 'blur'},
+            required: true,
-          ],
+            message: '请输入批次',
-          delivery_time_val: [
+            trigger: 'blur'
-            {required: true, message: '请输入货期', trigger: 'blur'}
+          }],
-          ],
+          brand: [{
-          expire_time: [
+            required: true,
-            {required: true, message: '请输入报价有效期', trigger: 'blur'}
+            message: '请选择报价品牌'
-          ]
+          }],
+          price_origin: [{
+            required: true,
+            message: '请输入价格',
+            trigger: 'blur'
+          }, ],
+          delivery_time_val: [{
+            required: true,
+            message: '请输入货期',
+            trigger: 'blur'
+          }],
+          expire_time: [{
+            required: true,
+            message: '请输入报价有效期',
+            trigger: 'blur'
+          }]
        },
        dialogVisible: false,
        brandList: [],
@@ -375,6 +410,7 @@
        });
      },
      getSkulist() {
+        console.log('库存匹配')
        this.$http('get', "/api/sku/list", {
          brand_id: this.inquiry_info.brand_id,
          goods_name: 'this.inquiry_info.goods_name',
@@ -388,7 +424,19 @@
          }
        })
      },
+      checkBind(ids){
+         this.$http('get', "/api/quote/checkpinlist", {
+          inquiry_items_id:this.$route.query.id,
+          pin_type:(this.active == 1 ? 1 : 2),
+          pin_obj_ids:ids
+        }).then(res => {
+          if (res.err_code === 0) {
+             console.log(res.data.bind_ids)
+          }
+        })
+      },
      getHistory() {
+        console.log('历史报价')
        this.$http('get', "/api/quote/history", {
          page: this.page,
          limit: this.limit,
@@ -399,6 +447,11 @@
          if (res.err_code === 0) {
            this.total = res.data.total;
            this.historyList = res.data.list || [];
+            var arr_=this.historyList,id_arr=[]
+            for(var i=0;i<arr_.length;i++){
+              id_arr.push(arr_[i].id)
+            }
+            this.checkBind(id_arr.join(","))
          } else {
            Message(res.err_msg);
          }
@@ -463,6 +516,13 @@
            this.$http('post', "/api/quote/save", this.ruleForm).then(res => {
              if (res.err_code == 0) {
                Message('操作成功');
+                this.$http('post', "/api/quote/pin", {
+                  inquiry_items_id:this.ruleForm.inquiry_items_id,
+                  pin_type:(this.active == 1 ? 1 : 2),	
+                  pin_obj_id:this.currentDataId
+                }).then(res => {
+                  if (res.err_code == 0) {
+                    Message('操作成功');
                    setTimeout(() => {
                      window.location.reload();
                    }, 2000)
@@ -470,6 +530,13 @@
                    Message(res.err_msg);
                  }
                  loadingInstance.close();
+                })
+              } else {
+                Message(res.err_msg);
+                loadingInstance.close();
+              }
            }).catch(err => {
              loadingInstance.close();
            });
@@ -488,14 +555,20 @@
            this.brandList = [];
            this.ruleForm.brand = "";
            for (var i = 0; i < arrlist_.length; i++) {
-              this.brandList.push({value: arrlist_[i]['brand_name'], brand_id: arrlist_[i]['brand_id']})
+              this.brandList.push({
+                value: arrlist_[i]['brand_name'],
+                brand_id: arrlist_[i]['brand_id']
+              })
            }
            cb(this.brandList);
          }
        })
      },
      handleSelectBrandName(item) {
-        let brand_ss = [{brand_id: '', brand_name: ''}];
+        let brand_ss = [{
+          brand_id: '',
+          brand_name: ''
+        }];
        brand_ss[0].brand_id = item.brand_id;
        brand_ss[0].brand_name = item.value;
        this.ruleForm.brand_s = JSON.stringify(brand_ss);
@@ -530,7 +603,8 @@
          return;
        }
-        if (this.multipleSelection[0].status == 1 || this.multipleSelection[0].status == 3 || this.multipleSelection[0].status == 5) {
+        if (this.multipleSelection[0].status == 1 || this.multipleSelection[0].status == 3 || this.multipleSelection[0]
+          .status == 5) {
          for (var i = 0; i < this.multipleSelection.length; i++) {
            arr.push(this.multipleSelection[i]['id'])
@@ -568,7 +642,10 @@
                this.ruleForm.expire_time = res.data.quote_info.expire_time;
              }
-              let brand_ss = [{brand_id: '', brand_name: ''}];
+              let brand_ss = [{
+                brand_id: '',
+                brand_name: ''
+              }];
              brand_ss[0].brand_id = res.data.quote_info.brand_id;
              brand_ss[0].brand_name = res.data.quote_info.brand_name;
              this.ruleForm.brand_s = JSON.stringify(brand_ss);
@@ -613,7 +690,8 @@
      },
      handle(index, row) {
-        this.title = '确认-匹配库存';
+        this.currentDataId=row.id
+        this.title = this.active == 1 ? '确认-历史报价' : '确认-匹配库存';
        this.dialogVisible = true;
        this.ruleForm.quote_id = '';
        this.isModify = true;
@@ -647,7 +725,10 @@
            }
-            let brand_ss = [{brand_id: '', brand_name: ''}];
+            let brand_ss = [{
+              brand_id: '',
+              brand_name: ''
+            }];
            brand_ss[0].brand_id = res.data.quote_info.brand_id;
            brand_ss[0].brand_name = res.data.quote_info.brand_name;
            this.ruleForm.brand_s = JSON.stringify(brand_ss);