Browse Source

Signed-off-by: liuboyan <632697560@qq.com>
bug

liuboyan 4 năm trước cách đây
mục cha
commit
993f148953

+ 1 - 1
src/page/baseInfo/components/supply/supplyEdit.vue

@@ -322,7 +322,7 @@
           </Col>
           <Col span="4" class-name="tables">当前报价</Col>
           <Col span="8" class-name="tables">
-          <InputNumber :min="1" :precision="3" v-model="xzbjForm.dqbj" placeholder="请输入" style="width: 95%" />
+          <InputNumber :min="1" :precision="3" :active-change="false" v-model="xzbjForm.dqbj" placeholder="请输入" style="width: 95%" />
           </Col>
           <Col span="4" class-name="tables">
           </Col>

+ 1 - 1
src/page/purchase/components/balance/balanceAdd.vue

@@ -114,7 +114,7 @@
           <Col span="4" class-name="tables">{{ form.total }}</Col>
           <Col span="4" class-name="tables">调整金额(元)</Col>
           <Col span="4" class-name="tables">
-          <InputNumber :min="1" :precision="3" :disabled="form.spzt != '1' && form.spzt != '4'" v-model="form.tzje"
+          <InputNumber :min="1" :precision="3" :active-change="false" :disabled="form.spzt != '1' && form.spzt != '4'" v-model="form.tzje"
             placeholder="请输入" style="width: 95%" />
           </Col>
           <Col span="4" class-name="tables">实际支付金额(元)</Col>

+ 2 - 2
src/page/purchase/components/order/orderAdd.vue

@@ -209,7 +209,7 @@
         <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading"
           @on-select="tableOnSelect" highlight-row border>
           <template slot-scope="{ row, index }" slot="purchaseNum">
-            <InputNumber :min="1" :precision="2" :disabled="
+            <InputNumber :min="1" :precision="2" :active-change="false" :disabled="
                 (form.spzt != '1' && form.spzt != '4') || row.isCancel == '1'
               " v-model="tableData[index].purchaseNum" placeholder="请输入" style="width: 95%" />
           </template>
@@ -217,7 +217,7 @@
             <a @click.prevent="goDetail(row)">{{ row.applyRuleCode }}</a>
           </template>
           <template slot-scope="{ row, index }" slot="price">
-            <InputNumber :min="1" :precision="3" :disabled="form.spzt != '1' && form.spzt != '4'"
+            <InputNumber :min="1" :precision="3" :active-change="false" :disabled="form.spzt != '1' && form.spzt != '4'"
               v-model="tableData[index].price" placeholder="请输入" style="width: 95%" />
           </template>
           <template slot-scope="{ row, index }" slot="totalPrice">

+ 23 - 2
src/page/purchase/components/order/orderMxAdd.vue

@@ -25,7 +25,14 @@
           <Input v-model="searchForm.wlmc" placeholder="物料编码或名称" />
         </Col>
         <Col span="4">
-          <Input v-model="searchForm.applicantName" placeholder="申请人名称" />
+          <Select clearable filterable v-model="searchForm.purchaserId" placeholder="分管采购员">
+            <Option
+              v-for="item in fgcgyList"
+              :value="item.userId"
+              :key="item.userId"
+            >{{ item.userName }}</Option>
+          </Select>
+          <!--          <Input v-model="searchForm.applicantName" placeholder="申请人名称" />-->
         </Col>
         <Col span="4">
           <Button type="primary" style="width: 80px" @click="pageNum = 1;getTableData()">查询</Button>
@@ -61,6 +68,7 @@ import {
   tbiGoodsCategoryList,
   warehouseList,
   getMaterialPrice,
+  getJobList,
 } from "@/service/getData";
 export default {
   name: "orderMxAdd",
@@ -93,6 +101,7 @@ export default {
         ejfl: "", // 二级分类
         wlmc: "", //物料编码或名称
         applicantName: "", //物料编码或名称
+        purchaserId: "", //物料编码或名称
       },
       ckList: [],
       allFlList: [],
@@ -100,6 +109,7 @@ export default {
       ejflList: [],
       jldwList: [],
       wllxList: [],
+      fgcgyList: [],
       //   表格参数
       tableLoading: false,
       pageTotal: 0,
@@ -209,7 +219,7 @@ export default {
     };
   },
   created() {
-    this.searchForm.applicantName = localStorage.user_name
+    // this.searchForm.applicantName = localStorage.user_name
     tbiGoodsCategoryList().then((res) => {
       this.allFlList = res.data.data;
       let arr = [];
@@ -219,6 +229,16 @@ export default {
         }
       }
     });
+    getJobList().then((res) => {
+      if (res.status == 200) {
+        this.fgcgyList = res.data;
+        if (res.data.filter(site => site.userId == localStorage.user_id).length){
+          this.searchForm.purchaserId = localStorage.user_id
+        }
+      } else {
+        this.$Message.error("获取分管采购员列表失败!");
+      }
+    });
   },
   methods: {
     //列表方法
@@ -233,6 +253,7 @@ export default {
         queryText2: "",
         projectIds: this.projectId.split(",")[0],
         // projectIds: 10,
+        purchaserId: this.searchForm.purchaserId,
         storehouseId: this.searchForm.ck,
         applicantName: this.searchForm.applicantName,
       };

+ 1 - 1
src/page/purchase/components/plan/planAdd.vue

@@ -142,7 +142,7 @@
           @on-select-all-cancel="tableOnCancel" class="">
           <template slot-scope="{ row, index }" slot="amount">
             <div>
-              <InputNumber :min="1" :precision="2" v-model="tableData[index].amount"
+              <InputNumber :min="1" :precision="2" :active-change="false" v-model="tableData[index].amount"
                 :disabled="form.spzt == '2' || form.spzt == '1'" placeholder="请输入" style="width: 95%" />
             </div>
           </template>

+ 1 - 1
src/page/purchase/components/plan/planMxAdd.vue

@@ -96,7 +96,7 @@
         <span class="mustSpan">*</span>
         </Col>
         <Col span="6" class-name="tables">
-        <InputNumber v-model="addForm.scjg" style="width: 95%" placeholder="请输入" />
+        <InputNumber v-model="addForm.scjg" :active-change="false" style="width: 95%" placeholder="请输入" />
         </Col>
         <Col span="6" class-name="tables">
         </Col>

+ 2 - 2
src/page/purchase/components/pool/poolAdd.vue

@@ -204,11 +204,11 @@
         <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading" border
           @on-select="tableOnSelect" highlight-row>
           <template slot-scope="{ row, index }" slot="purchaseNum">
-            <InputNumber :min="1" :precision="2" :disabled="form.spzt == '2'" v-model="tableData[index].purchaseNum"
+            <InputNumber :min="1" :precision="2" :active-change="false" :disabled="form.spzt == '2'" v-model="tableData[index].purchaseNum"
               placeholder="请输入" style="width: 95%" />
           </template>
           <template slot-scope="{ row, index }" slot="price">
-            <InputNumber :min="1" :precision="3" :disabled="form.spzt == '2' || form.spzt == '3'"
+            <InputNumber :min="1" :precision="3" :active-change="false" :disabled="form.spzt == '2' || form.spzt == '3'"
               v-model="tableData[index].price" placeholder="请输入" style="width: 95%" />
           </template>
           <template slot-scope="{ row, index }" slot="totalPrice">