Merge tag 'Hotfix-zh-288' into develop

Finish Hotfix-zh-288

src/api/stock.js

@@ -18,6 +18,15 @@ export function getWarehouseList(params) {
   })
 }
 
+// 获取仓储费报表列表
+export function getListStorageFee(params) {
+  return request({
+    url: '/sale/order/listStorageFee',
+    method: 'get',
+    params
+  })
+}
+
 // 获取销售类型列表
 export function getSalesTypeList(params) {
   return request({

src/views/basic_data/material/machine_list.vue

@@ -37,7 +37,7 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="体积" prop="volume">
               <el-input
-                type="number"
+                type="number" @mousewheel.native.prevent
                 placeholder="请输入体积"
                 v-model.number="screenForm.volume"
               ></el-input>
@@ -254,7 +254,7 @@
         :model="diaLogForm"
         label-width="70px"
         :rules="rules"
-      
+
         label-position="left"
       >
         <el-form-item label="类型" prop="type">
@@ -280,7 +280,7 @@
         <el-form-item label="体积" prop="volume">
           <el-input
             v-model="diaLogForm.volume"
-            type="number"
+            type="number" @mousewheel.native.prevent
             size="normal"
           ></el-input>
         </el-form-item>

src/views/basic_data/stock/stock_fee_list.vue

@@ -0,0 +1,592 @@
+<template>
+  <div class="app-container">
+    <!-- 筛选条件 -->
+    <div class="screen-container">
+      <el-form
+        ref="screenForm"
+        :model="screenForm"
+        label-width="120px"
+        size="mini"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="发货申请" prop="orderNo">
+              <el-input
+                v-model="screenForm.orderNo"
+                placeholder="请输入发货申请"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="销售出库单号" prop="id">
+              <el-input
+                v-model="screenForm.id"
+                placeholder="请输入销售出库单号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="订单类型" prop="orderType">
+              <el-select
+                v-model="screenForm.orderType"
+                clearable
+                filterable
+              >
+                <el-option
+                  v-for="item in orderType"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="订单号" prop="mainOrderId">
+              <el-input
+                v-model="screenForm.mainOrderId"
+                placeholder="请输入订单号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="订单日期" prop="orderDate">
+              <el-date-picker
+                v-model="screenForm.orderDate"
+                type="datetimerange"
+                range-separator="至"
+                style="width: 100%"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="发货日期" prop="invoiceDate">
+              <el-date-picker
+                v-model="screenForm.invoiceDate"
+                type="datetimerange"
+                range-separator="至"
+                style="width: 100%"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="仓库" prop="correspondId">
+              <el-select
+                v-model="screenForm.correspondId"
+                clearable
+                filterable
+                multiple
+              >
+              <el-option
+                  v-for="(item, index) in warehouseList"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商名称" prop="customerName">
+              <el-input
+                v-model="screenForm.customerName"
+                placeholder="请输入经销商名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编码" prop="customerNumber">
+              <el-input
+                v-model="screenForm.customerNumber"
+                placeholder="请输入经销商编码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="物料名称" prop="materialName">
+              <el-input
+                v-model="screenForm.materialName"
+                placeholder="请输入物料名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="物料编码" prop="materialNumber">
+              <el-input
+                v-model="screenForm.materialNumber"
+                placeholder="请输入物料编码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="规格型号" prop="specification">
+              <el-input
+                v-model="screenForm.specification"
+                placeholder="请输入规格型号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="24" class="tr">
+            <el-form-item>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm"
+                >搜索</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="mymain-container">
+      <div class="btn-group clearfix">
+        <div>
+          <ExportButton
+            :ex-url="'/sale/order/listStorageFeeExport'"
+            :ex-params="exParams"
+          />
+        </div>
+      </div>
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          show-summary
+            :summary-method="$getSummaries"
+        >
+        <el-table-column
+            align="left"
+            label="订单类型"
+            prop="orderType"
+            min-width="150"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{filterOderType(scope.row.orderType)}}
+            </template>
+        </el-table-column>
+          <el-table-column
+            align="left"
+            label="订单号"
+            prop="mainOrderId"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="订单日期"
+            prop="theTime"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="订单审核时间"
+            prop="examineTime"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="预留时间"
+            prop="reservedCreateTime"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="预留单号"
+            prop="reservedId"
+            min-width="150"
+            show-overflow-tooltip
+          />  <el-table-column
+            align="left"
+            label="发货单号"
+            prop="invoiceId"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="发货单日期"
+            prop="orderTime"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="发货审核时间"
+            prop="examineTime"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="出库状态"
+            prop="salesExamineStatus"
+            min-width="150"
+            show-overflow-tooltip
+          >
+          <template slot-scope="scope">
+            {{filterExamineStatus(scope.row.salesExamineStatus)}}
+          </template>
+        </el-table-column>
+          <el-table-column
+            align="left"
+            label="出库审核时间"
+            prop="salesApprovalTime"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="出库审核人"
+            prop="salesApprovalName"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="仓库"
+            prop="correspondName"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="客户编号"
+            prop="customerNumber"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="客户名称"
+            prop="customerName"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="存货编号"
+            prop="materialCode"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="规格型号"
+            prop="specification"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="right"
+            label="订单数量"
+            prop="qty"
+            min-width="150"
+            show-overflow-tooltip
+          /> <el-table-column
+            align="right"
+            label="价税合计"
+            prop="payAmount"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="right"
+            label="折扣额"
+            prop="payRebateAmount"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="right"
+            label="合计"
+            prop="payAmount"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="right"
+            label="发货数量"
+            prop="refundableQty"
+            min-width="150"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="right"
+            label="未发货数量"
+            prop="sendQty"
+            min-width="150"
+            show-overflow-tooltip
+          />
+        </el-table>
+      </div>
+    </div>
+    <div class="pagination clearfix">
+      <div class="fr">
+        <el-pagination
+          :current-page="currentPage"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="listTotal"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getListStorageFee } from "@/api/stock";
+import { getCategoryList } from "@/api/common";
+import { getWarehouseList } from "@/api/supply/apply";
+
+export default {
+  data() {
+    return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      dataList: null, // 列表数据
+      listLoading: false, // 列表加载loading
+      screenForm: {
+        correspondId:[] ,
+        customerName: "",
+        customerNumber: "",
+        endTime: "",
+        id:'',
+        invoiceEndTime: "",
+        invoiceStartTime: "",
+        mainOrderId: "",
+        materialName: "",
+        materialNumber: "",
+        orderNo: '',
+        orderType: "",
+        specification: "",
+        startTime: "",
+        orderDate:[],
+        invoiceDate:[]
+      },
+      typeList: [],
+      warehouseList: [],
+      categoryList: [],
+      orderType: [
+        {
+          value: "TRADE",
+          label: "商用",
+        },
+        {
+          value: "HOME",
+          label: "家用",
+        },
+        {
+          value: "RETAIL",
+          label: "零售",
+        },
+
+        {
+          value: "RETAIL_POLICY",
+          label: "政策",
+        },
+        {
+          value: "PERMU_HOME",
+          label: "置换家用",
+        },
+        {
+          value: "PERMU_TRADE",
+          label: "置换商用",
+        },
+        {
+          value: "PERMU_RETAIL",
+          label: "置换零售",
+        },
+        {
+          value: "PERMU_RETAIL_POLICY",
+          label: "置换政策",
+        },
+        {
+          value: "REQUISITION_RETAIL",
+          label: "调拨零售",
+        },
+        {
+          value: "REQUISITION_RETAIL_POLICY",
+          label: "调拨政策",
+        },
+        {
+          value: "REQUISITION_TRADE",
+          label: "调拨商用",
+        },
+        {
+          value: "REQUISITION_HOME",
+          label: "调拨家用",
+        },
+      ],
+      examineStatus:[
+        {
+          value:'SAVE',
+          label:'保存'
+        },
+        {
+          value:'WAIT',
+          label:'待审核'
+        },
+        {
+          value:'OK',
+          label:'通过'
+        },
+        {
+          value:'FAIL',
+          label:'不通过'
+        },{
+          value:'CLOSE',
+          label:'关闭'
+        }
+      ]
+    };
+  },
+
+  computed: {
+    exParams() {
+      return {
+        correspondId: this.screenForm.correspondId.join(','),
+        customerName: this.screenForm.customerName,
+        customerNumber: this.screenForm.customerNumber,
+        endTime: this.screenForm.orderDate[1],
+        id:this.screenForm.id,
+        invoiceEndTime: this.screenForm.invoiceDate[1],
+        invoiceStartTime: this.screenForm.invoiceDate[0],
+        mainOrderId: this.screenForm.mainOrderId,
+        materialName: this.screenForm.materialName,
+        materialNumber: this.screenForm.materialNumber,
+        orderNo:this.screenForm.orderNo,
+        orderType: this.screenForm.orderType,
+        specification: this.screenForm.specification,
+        startTime: this.screenForm.orderDate[0],
+      };
+    },
+    filterOderType(){
+      return (type)=>{
+       return this.orderType.find(e=>e.value===type).label
+      }
+    },
+    filterExamineStatus(){
+      return (status)=>{
+        return  this.examineStatus.find(e=>e.value===status).label
+      }
+    }
+  },
+
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      const params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        correspondId: this.screenForm.correspondId.join(','),
+        customerName: this.screenForm.customerName,
+        customerNumber: this.screenForm.customerNumber,
+        endTime: this.screenForm.orderDate[1],
+        id:this.screenForm.id,
+        invoiceEndTime: this.screenForm.invoiceDate[1],
+        invoiceStartTime: this.screenForm.invoiceDate[0],
+        mainOrderId: this.screenForm.mainOrderId,
+        materialName: this.screenForm.materialName,
+        materialNumber: this.screenForm.materialNumber,
+        orderNo:this.screenForm.orderNo,
+        orderType: this.screenForm.orderType,
+        specification: this.screenForm.specification,
+        startTime: this.screenForm.orderDate[0],
+      };
+      this.listLoading = true;
+      getListStorageFee(params).then((res) => {
+        res.data.records.forEach((item) => {
+          item.sums1 = [
+            "qty",
+            "sendQty",
+            "directTransferQty",
+            "hasSendQty",
+            "refundableQty",
+          ];
+          item.sums2 = [
+            "price",
+            "totalAmount",
+            "payAmount",
+            "rebateAmount",
+            "payRebateAmount",
+            "totalDiscAmount",
+          ];
+        });
+        this.dataList = res.data.records;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      });
+      this.getWarehouseList();
+      this.getCategoryList();
+    },
+    // 获取仓库列表
+    getWarehouseList() {
+      getWarehouseList({
+        pageNum: 1,
+        pageSize: -1,
+      }).then((res) => {
+        this.warehouseList = res.data.records;
+      });
+    },
+
+    // 获取存货类别列表
+    getCategoryList() {
+      getCategoryList({
+        pageNum: 1,
+        pageSize: -1,
+      }).then((res) => {
+        this.categoryList = res.data.records;
+      });
+    },
+    // 提交筛选表单
+    submitScreenForm() {
+      this.currentPage = 1;
+      this.getList();
+    },
+
+    // 重置筛选表单
+    resetScreenForm() {
+      this.$refs.screenForm.resetFields();
+      this.currentPage = 1;
+      this.getList();
+    },
+
+    // 更改每页数量
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getList();
+    },
+
+    // 更改当前页
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getList();
+    },
+  },
+};
+</script>

src/views/basic_data/warehouse/warehouse_book.vue

@@ -55,7 +55,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input size="mini" class="yinput" v-model.number="scope.row.number" type="number" :disabled="scope.row.isDisabled" />
+              <el-input size="mini" class="yinput" v-model.number="scope.row.number" type="number" @mousewheel.native.prevent :disabled="scope.row.isDisabled" />
             </template>
           </el-table-column>
           <el-table-column
@@ -66,7 +66,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input size="mini" class="yinput" v-model.number="scope.row.towerNum" type="number" :disabled="scope.row.isDisabled" />
+              <el-input size="mini" class="yinput" v-model.number="scope.row.towerNum" type="number" @mousewheel.native.prevent :disabled="scope.row.isDisabled" />
             </template>
           </el-table-column>
 

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -247,20 +247,20 @@
         </el-form-item>
         <el-form-item label="仓库存放" class="sty" prop="freeDay">
           <el-input
-            type="number"
+            type="number" @mousewheel.native.prevent
             v-model="dialogForm.freeDay"
             class="inputStyle"
           />天内可免费受存储管理费用.
           <br/>
           当超过
           <el-input
-            type="number"
+            type="number" @mousewheel.native.prevent
             v-model="dialogForm.freeDay"
             class="inputStyle"
           />天后,按每立方米
           <el-input
             v-model="dialogForm.toll"
-            type="number"
+            type="number" @mousewheel.native.prevent
             class="inputStyle"
           />
           元/天计算

src/views/deposit_home/components/deposit_list-detail.vue

@@ -221,6 +221,9 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="right"
               label="单价"
@@ -737,6 +740,7 @@
               <span>{{ scope.row.specification }}</span>
             </template>
           </el-table-column>
+
           <el-table-column
             align="rihgt"
             label="单价"

src/views/finance/change_apply.vue

@@ -71,13 +71,13 @@
           </el-table-column>
           <el-table-column align="left" label="返利金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input size="mini" type="number" v-model="scope.row.money"></el-input>
+              <el-input size="mini" type="number" @mousewheel.native.prevent v-model="scope.row.money"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="折让金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <div v-if="scope.$index == 0"></div>
-              <el-input v-if="scope.$index == 1" size="mini" type="number" v-model="scope.row.allowanceAmount"></el-input>
+              <el-input v-if="scope.$index == 1" size="mini" type="number" @mousewheel.native.prevent v-model="scope.row.allowanceAmount"></el-input>
 
             </template>
           </el-table-column>

src/views/finance/components/rebate_list-confirm.vue

@@ -59,7 +59,7 @@
           <el-table-column align="left" label="返利类型" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="总返利金额" prop="amount" min-width="160" show-overflow-tooltip>
             <!-- <template slot-scope="scope">
-             
+
             </template> -->
           </el-table-column>
           <el-table-column align="right" label="返利金额" prop="" min-width="160" show-overflow-tooltip>
@@ -69,7 +69,7 @@
           </el-table-column>
           <el-table-column align="right" label="折让金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input class="mountclass" :disabled='show' type="number" v-model="scope.row.allowanceAmount"></el-input>
+              <el-input class="mountclass" :disabled='show' type="number" @mousewheel.native.prevent v-model="scope.row.allowanceAmount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注" prop="policyDocNo" min-width="160" show-overflow-tooltip></el-table-column>

src/views/finance/components/receivable_list-add.vue

@@ -150,7 +150,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.afterTaxAmount"
-                type="number"
+                type="number" @mousewheel.native.prevent
               ></el-input>
             </template>
           </el-table-column>
@@ -162,17 +162,17 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.tax"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model="scope.row.tax"></el-input>
             </template>
           </el-table-column> -->
           <el-table-column align="right" label="*总金额" prop="tax" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input class='mountclass' type="number" v-model="scope.row.totalAmount"></el-input>
+              <el-input class='mountclass' type="number" @mousewheel.native.prevent v-model="scope.row.totalAmount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="税率%" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input type="number" :min="0" oninput="if(value>100)value=100;if(value<0)value=0" v-model="scope.row.taxRate"></el-input>
+              <el-input type="number" @mousewheel.native.prevent :min="0" oninput="if(value>100)value=100;if(value<0)value=0" v-model="scope.row.taxRate"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>

src/views/finance/components/receivable_list-detail.vue

@@ -173,7 +173,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.afterTaxAmount"
-                type="number"
+                type="number" @mousewheel.native.prevent
               ></el-input>
             </template>
           </el-table-column>
@@ -185,17 +185,17 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.tax"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model="scope.row.tax"></el-input>
             </template>
           </el-table-column> -->
           <el-table-column align="right" label="*总金额" prop="tax" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input class='mountclass' type="number" v-model="scope.row.totalAmount"></el-input>
+              <el-input class='mountclass' type="number" @mousewheel.native.prevent v-model="scope.row.totalAmount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="税率%" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input type="number" :min="0" oninput="if(value>100)value=100;if(value<0)value=0" v-model="scope.row.taxRate"></el-input>
+              <el-input type="number" @mousewheel.native.prevent :min="0" oninput="if(value>100)value=100;if(value<0)value=0" v-model="scope.row.taxRate"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
@@ -401,4 +401,4 @@ export default {
 .selectClass {
   width: 100%;
 }
-</style>
+</style>

src/views/finance/rebate_form.vue

@@ -90,12 +90,12 @@
           </el-table-column>
           <el-table-column align="right" label="返利总金额" prop="amount" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input size="mini" class="mountclass" type="number" v-model="scope.row.amount"></el-input>
+              <el-input size="mini" class="mountclass" type="number" @mousewheel.native.prevent v-model="scope.row.amount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="right" label="暂扣返利" prop="withholdAmount" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input size="mini" class="mountclass" type="number" v-model="scope.row.withholdAmount"></el-input>
+              <el-input size="mini" class="mountclass" type="number" @mousewheel.native.prevent v-model="scope.row.withholdAmount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="政策文件流水号" prop="policyFileNo" min-width="160" show-overflow-tooltip>

src/views/finance/standbook_list.vue

@@ -106,6 +106,10 @@
         <li>
           其他暂扣款:<span>{{ amountList.otherCount }}</span>
         </li>
+        <li>
+          余额:<span>{{ amountList.totalBalanceAmount }}</span>
+        </li>
+
       </ul>
       <!-- 列表 -->
       <div class="mymain-container">
@@ -746,20 +750,20 @@ export default {
         if (index === 12) {
           sums[index] = this.computedFn(data, 6);
         }
-        if (index === 13) {
-          let map2 = data.map((v) => {
-            return v.balanceAmount;
-          });
-          let aa = map2.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-          sums[index] = numToFixed(aa);
-        }
+        // if (index === 13) {
+        //   let map2 = data.map((v) => {
+        //     return v.balanceAmount;
+        //   });
+        //   let aa = map2.reduce((prev, curr) => {
+        //     const value = Number(curr);
+        //     if (!isNaN(value)) {
+        //       return prev + curr;
+        //     } else {
+        //       return prev;
+        //     }
+        //   }, 0);
+        //   sums[index] = numToFixed(aa);
+        // }
       });
 
       return sums;

src/views/finance/wallet.vue

@@ -134,9 +134,9 @@
       <el-form ref="exportForm" :rules="exportRules" :model="exportForm" label-width="120px">
         <el-form-item label="编码范围" prop="">
           <div class="fanwei">
-            <el-input v-model="exportForm.startCustomerId" type="number" />
+            <el-input v-model="exportForm.startCustomerId" type="number" @mousewheel.native.prevent />
             <span>——</span>
-            <el-input v-model="exportForm.endCustomerId" type="number" />
+            <el-input v-model="exportForm.endCustomerId" type="number" @mousewheel.native.prevent />
           </div>
         </el-form-item>
       </el-form>

src/views/sales_policy/components/AddPolicy.vue

@@ -280,7 +280,7 @@
                 <el-input
                   class="yinput"
                   v-model.number="scope.row.discAmount"
-                  type="number"
+                  type="number" @mousewheel.native.prevent
                   placeholder="请输入格力折扣"
                   size="mini"
                 />
@@ -297,7 +297,7 @@
                 <el-input
                   class="yinput"
                   v-model.number="scope.row.price"
-                  type="number"
+                  type="number" @mousewheel.native.prevent
                   placeholder="请输入单价"
                   size="mini"
                 />

src/views/sales_policy/components/editPolicy.vue

@@ -268,7 +268,7 @@
                 size="mini"
                   class="yinput"
                   v-model.number="scope.row.discAmount"
-                  type="number"
+                  type="number" @mousewheel.native.prevent
                   placeholder="请输入格力折扣"
 
                 />
@@ -280,7 +280,7 @@
                 <el-input
                   class="yinput"
                   v-model.number="scope.row.price"
-                  type="number"
+                  type="number" @mousewheel.native.prevent
                   placeholder="请输入单价"
                   size="mini"
                 />

src/views/sales_rebate/rebate_list.vue

@@ -105,7 +105,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="返利折扣比例" prop="rebateRate">
-            <el-input type="number" placeholder="例如0.1=1折" :disabled="type == 3" @change="handleNumber" v-model.number="dialogForm.rebateRate"></el-input>
+            <el-input type="number" @mousewheel.native.prevent placeholder="例如0.1=1折" :disabled="type == 3" @change="handleNumber" v-model.number="dialogForm.rebateRate"></el-input>
           </el-form-item>
           <!-- <el-form-item label="销售类型编码" prop="saleTypeCode">
             <el-input

src/views/sales_rebate/rebate_list_type.vue

@@ -82,7 +82,7 @@
 
           <!-- <el-form-item label="返利折扣比例" prop="rebateRate">
             <el-input
-              type="number"
+              type="number" @mousewheel.native.prevent
               placeholder="例如0.1=1折"
               :readonly="type == 3"
               @change="handleNumber"

src/views/setting/other.vue

@@ -35,7 +35,7 @@
     <div v-show="formType === 'third'">
       <div style="margin: 40px 0 30px;">
         <div>预留单自动生成时间，从订单审单后，第</div>
-        <el-input v-model="thirdForm.input1.dictValue" type="number" size="small" style="width: 150px; margin-top: 20px; margin-right: 10px"></el-input>
+        <el-input v-model="thirdForm.input1.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 150px; margin-top: 20px; margin-right: 10px"></el-input>
         <span>天零时起，按商家提交订单时间顺序，自动生成预留单</span>
       </div>
       <el-button type="primary" size="small" @click="submitForm('third')">确 定</el-button>
@@ -48,27 +48,27 @@
         <div style="margin-top: 10px">总可发货数为0，显示无货</div>
         <div style="margin-top: 10px">
           <span>总可发货数</span>
-          <el-input v-model="fourthForm.input1.dictValue" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input v-model="fourthForm.input1.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
           <span>到</span>
-          <el-input v-model="fourthForm.input2.dictValue" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input v-model="fourthForm.input2.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
           <span>，总库存显示具体数量</span>
         </div>
         <div style="margin-top: 10px">
           <span>总可发货数</span>
-          <el-input v-model="fourthForm.input3.dictValue" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input v-model="fourthForm.input3.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
           <span>到</span>
-          <el-input v-model="fourthForm.input4.dictValue" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input v-model="fourthForm.input4.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
           <span>，总库存显示有货</span>
         </div>
         <div style="margin-top: 10px">
           <span>总可发货数大于</span>
-          <el-input v-model="fourthForm.input5.dictValue" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input v-model="fourthForm.input5.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
           <span>，总库存显示充足</span>
         </div>
         <div style="margin-top: 30px">发货申请查询库存时：</div>
         <div style="margin-top: 10px">
           <span>可发货数大于</span>
-          <el-input v-model="fourthForm.input6.dictValue" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input v-model="fourthForm.input6.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
           <span>显示充足</span>
         </div>
       </div>

src/views/supply/apply/components/apply_detail.vue

@@ -169,7 +169,7 @@
         <div class="footer">
           <el-button  type="primary" icon="el-icon-printer" @click="toPrint" :disabled="detailData.examineStatus !== 'OK'" v-if="$checkBtnRole('print', $route.meta.roles)">打 印</el-button>
           <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-            <el-button slot="reference">关 闭</el-button>
+            <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>
       </div>

src/views/supply/apply/components/apply_examine.vue

@@ -104,7 +104,7 @@
         <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number"></el-input>
+            <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
@@ -162,7 +162,7 @@
           @onConfirm="goBack"
           style="margin-left: 10px;"
         >
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>

src/views/supply/apply/components/apply_form.vue

@@ -169,7 +169,7 @@
           <el-table-column align="center" label="已申请数量" prop="alreadyInvoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="本次申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.invoiceNum" size="small" type="number" :disabled="scope.row.selected"></el-input>
+              <el-input v-model="scope.row.invoiceNum" size="small" type="number" @mousewheel.native.prevent :disabled="scope.row.selected"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" label="对应库存数量" prop="stockCorrespond" min-width="110" show-overflow-tooltip>

src/views/supply/apply/components/apply_return_form.vue

@@ -90,7 +90,7 @@
         <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.invoiceNum" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.invoiceNum" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <!-- <el-table-column align="left" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
@@ -125,7 +125,7 @@
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>
@@ -199,7 +199,7 @@
           <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.invoiceNum" size="mini" type="number" :disabled="scope.row.selected"></el-input>
+              <el-input v-model="scope.row.invoiceNum" size="mini" type="number" @mousewheel.native.prevent :disabled="scope.row.selected"></el-input>
             </template>
           </el-table-column>
         </el-table>

src/views/supply/apply/components/engin_detail.vue

@@ -204,7 +204,7 @@
         <div class="footer">
           <el-button  type="primary" icon="el-icon-printer" @click="toPrint" :disabled="detailData.examineStatus !== 'OK'" v-if="$checkBtnRole('print', $route.meta.roles)">打 印</el-button>
           <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-            <el-button slot="reference">关 闭</el-button>
+            <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>
       </div>

src/views/supply/apply/components/engin_examine.vue

@@ -147,7 +147,7 @@
 
         <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number"></el-input>
+            <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
        <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
@@ -189,7 +189,7 @@
         <el-button type="primary" @click="clickSubmitForm('OK')">审批通过</el-button>
         <el-button type="warning" @click="clickSubmitForm('SAVE')">审批驳回</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>

src/views/supply/apply/components/engin_return.vue

@@ -144,7 +144,7 @@
         </el-col>
       </el-row>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
@@ -153,7 +153,7 @@
           @onConfirm="goBack"
           style="margin-left: 10px;"
         >
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>
@@ -239,4 +239,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/apply/components/engin_return_form.vue

@@ -183,7 +183,7 @@
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>
@@ -282,7 +282,7 @@
           <el-table-column align="right" label="未申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="本次申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.invoiceNum" size="mini" type="number"></el-input>
+              <el-input v-model="scope.row.invoiceNum" size="mini" type="number" @mousewheel.native.prevent></el-input>
             </template>
           </el-table-column>
           <!-- <el-table-column align="right" label="总库存数量" prop="stockAdequate" min-width="100" show-overflow-tooltip>

src/views/supply/deliver/components/commerce_detail.vue

@@ -171,7 +171,7 @@
         <div class="footer">
           <el-button  type="primary" icon="el-icon-printer" @click="toPrint" v-if="$checkBtnRole('print', $route.meta.roles)">打 印</el-button>
           <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-            <el-button slot="reference">关 闭</el-button>
+            <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>
       </div>

src/views/supply/deliver/components/deliver_detail.vue

@@ -174,7 +174,7 @@
         <div class="footer">
           <el-button  type="primary" icon="el-icon-printer" @click="toPrint" v-if="$checkBtnRole('print', $route.meta.roles)">打 印</el-button>
           <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-            <el-button slot="reference">关 闭</el-button>
+            <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>
       </div>

src/views/supply/deliver/components/home_detail.vue

@@ -172,7 +172,7 @@
         <div class="footer">
           <el-button  type="primary" icon="el-icon-printer" @click="toPrint" v-if="$checkBtnRole('print', $route.meta.roles)">打 印</el-button>
           <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-            <el-button slot="reference">关 闭</el-button>
+            <el-button slot="reference">返回列表</el-button>
           </el-popconfirm>
         </div>
       </div>

src/views/supply/displace/components/displace_examine.vue

@@ -108,12 +108,12 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.qty" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="订单金额" min-width="100" show-overflow-tooltip>
@@ -125,7 +125,7 @@
         <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.discAmount" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.discAmount" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/engin/components/commerce_detail.vue

@@ -220,7 +220,7 @@
           <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button>
           <el-button type="primary" @click="overData" v-if="!isDealer">直调完结</el-button>
           <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus" v-if="!isDealer">直调发货</el-button>
-          <el-button @click="goBack">返回</el-button>
+          <el-button @click="goBack">返回列表</el-button>
         </div>
       </div>
     </div>
@@ -266,7 +266,7 @@
           <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.realDirectTransferQty" size="small" type="number"></el-input>
+              <el-input v-model="scope.row.realDirectTransferQty" size="small" type="number" @mousewheel.native.prevent></el-input>
             </template>
           </el-table-column>
           <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>

src/views/supply/engin/components/commerce_examine.vue

@@ -158,7 +158,7 @@
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.price | numToFixed }}
-            <!-- <el-input v-model="scope.row.price" size="small" type="number"></el-input> -->
+            <!-- <el-input v-model="scope.row.price" size="small" type="number" @mousewheel.native.prevent></el-input> -->
           </template>
         </el-table-column>
         <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="100" show-overflow-tooltip></el-table-column>
@@ -222,7 +222,7 @@
         <el-button type="primary" @click="clickSubmitForm(1)">审批通过</el-button>
         <el-button type="warning" @click="clickSubmitForm(0)">审批驳回</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>

src/views/supply/engin/components/commerce_form.vue

@@ -205,7 +205,7 @@
         <el-table-column align="center" label="已订数量" prop="hasOrderQty" min-width="80" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number" v-if="!isDealer"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" @mousewheel.native.prevent v-if="!isDealer"></el-input>
             <div v-else>{{scope.row.price}}</div>
           </template>
         </el-table-column>

src/views/supply/engin/components/commerce_return.vue

@@ -208,7 +208,7 @@
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm()">确定退订</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>

src/views/supply/engin/components/engin_detail.vue

@@ -176,7 +176,7 @@
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="overData" v-if="!isDealer" :disabled="detailData.examineStatus !== 'OK'">直调完结</el-button>
-        <el-button @click="goBack">关 闭</el-button>
+        <el-button @click="goBack">返回列表</el-button>
       </div>
     </div>
 

src/views/supply/engin/components/engin_examine.vue

@@ -188,12 +188,12 @@
         <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.qty" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="订单金额" min-width="100" prop="compute_amount" show-overflow-tooltip>
@@ -248,7 +248,7 @@
           @onConfirm="goBack"
           style="margin-left: 10px;"
         >
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>

src/views/supply/engin/components/engin_form.vue

@@ -227,12 +227,12 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" @mousewheel.native.prevent ></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.qty" size="small" type="number" @mousewheel.native.prevent ></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="订单金额" min-width="100" show-overflow-tooltip>

src/views/supply/engin/components/home_detail.vue

@@ -189,6 +189,9 @@
             <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -240,7 +243,7 @@
           <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button>
           <el-button type="primary" @click="overData" v-if="!isDealer">直调完结</el-button>
           <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus" v-if="!isDealer">直调发货</el-button>
-          <el-button @click="goBack">返回</el-button>
+          <el-button @click="goBack">返回列表</el-button>
         </div>
       </div>
     </div>
@@ -287,7 +290,7 @@
           <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input v-model="scope.row.realDirectTransferQty "   :disabled="!scope.row.isDirectTransfer"
- size="small" type="number"></el-input>
+ size="small" type="number" @mousewheel.native.prevent></el-input>
             </template>
           </el-table-column>
           <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/engin/components/home_examine.vue

@@ -223,13 +223,13 @@
         <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <!-- {{ (scope.row.qty*100 - scope.row.directTransferQty*100 - scope.row.retiredQty*100) / 100 }} -->
-            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.qty" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <!-- {{ scope.row.price | numToFixed }} -->
-            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
@@ -327,7 +327,7 @@
         <el-button type="primary" @click="clickSubmitForm(1)" :loading="formLoading">审批通过</el-button>
         <el-button type="warning" @click="clickSubmitForm(0)" :loading="formLoading">审批驳回</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;" v-if="!isCustomer">
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>

src/views/supply/engin/components/home_form.vue

@@ -220,13 +220,13 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.qty" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="订单金额" min-width="100" show-overflow-tooltip>

src/views/supply/engin/components/home_return.vue

@@ -205,7 +205,7 @@
         <el-table-column align="right" label="可退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="退订数量" prop="tdQty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.tdQty" size="mini" type="number"></el-input>
+            <el-input v-model="scope.row.tdQty" size="mini" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
@@ -237,7 +237,7 @@
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm()">确定退订</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;"  v-if="!isDealer">
-          <el-button slot="reference">关 闭</el-button>
+          <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>

src/views/supply/implement/components/sales_return_form.vue

@@ -78,7 +78,7 @@
         <el-table-column align="right" label="可退数量" prop="refundableQty" min-width="80" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.invoiceNum" size="mini" type="number"></el-input>
+            <el-input v-model="scope.row.invoiceNum" size="mini" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="left" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>

src/views/supply/pickup/pickup_list.vue

@@ -37,7 +37,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="手机号" prop="takerPhone">
-              <el-input type="number" v-model.number="screenForm.takerPhone" placeholder="请输入手机号"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model.number="screenForm.takerPhone" placeholder="请输入手机号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -63,7 +63,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="出库单号" prop="salesOrderId">
-              <el-input type="number" v-model.number="screenForm.salesOrderId" placeholder="请输入出库单号"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model.number="screenForm.salesOrderId" placeholder="请输入出库单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="12" class="tr">

src/views/supply/pickup/sum_list.vue

@@ -36,7 +36,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="手机号" prop="takerPhone">
-              <el-input type="number" v-model.number="screenForm.takerPhone" placeholder="请输入手机号"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model.number="screenForm.takerPhone" placeholder="请输入手机号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -62,7 +62,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="出库单号" prop="salesOrderId">
-              <el-input type="number" v-model.number="screenForm.salesOrderId" placeholder="请输入出库单号"></el-input>
+              <el-input type="number" @mousewheel.native.prevent v-model.number="screenForm.salesOrderId" placeholder="请输入出库单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="12" class="tr">

src/views/supply/policy/components/retail_detail.vue

@@ -339,7 +339,7 @@
           :disabled="detailData.examineStatus !== 'OK' || status"
           @click="handleFinish"
         >直调完成</el-button>
-        <!-- <el-button @click="goBack">关 闭</el-button> -->
+        <el-button @click="goBack">返回列表</el-button>
       </div>
     </div>
     <el-dialog title="直接调拨单（提前开票）" :visible.sync="isShowDirectDialog" width="80%">
@@ -587,7 +587,7 @@
               <el-input
                 v-model="scope.row.adjustNum"
                 size="small"
-                type="number"
+                type="number" @mousewheel.native.prevent
                 :disabled="!scope.row.isDirectTransfer"
               />
             </template>

src/views/supply/policy/components/retail_examine.vue

@@ -312,7 +312,7 @@
           :loading="formLoading"
           >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
         >
-        <el-button @click="goBack">关闭页面</el-button>
+        <el-button @click="goBack">返回列表</el-button>
       </div>
     </div>
   </div>

src/views/supply/policy/components/retail_form.vue

@@ -591,7 +591,7 @@
                   <template slot-scope="scope">
                     <el-input
                       v-model.lazy="scope.row.qty"
-                      type="number"
+                      type="number" @mousewheel.native.prevent
                       size="small"
                       class="yinput"
                       @blur="blurQty(scope.row.qty, scope.row)"
@@ -708,7 +708,7 @@
                 <template slot-scope="scope">
                   <el-input
                     v-model.lazy="scope.row.qty"
-                    type="number"
+                    type="number" @mousewheel.native.prevent
                     class="yinput"
                     size="small"
                     @blur="blurQty(scope.row.qty, scope.row)"

src/views/supply/policy/components/retail_return.vue

@@ -218,7 +218,7 @@
             <el-input
               v-model="scope.row.tdQty"
               size="small"
-              type="number"
+              type="number" @mousewheel.native.prevent
             ></el-input>
           </template>
         </el-table-column>
@@ -267,7 +267,7 @@
           :loading="formLoading"
           >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
         >
-        <el-button @click="goBack">关 闭</el-button>
+        <el-button @click="goBack">返回列表</el-button>
       </div>
     </div>
   </div>

src/views/supply/retail/components/retail_detail.vue

@@ -159,7 +159,7 @@
           <el-button type="primary" @click="openDirectDialog" :disabled="detailData.examineStatus !== 'OK'" v-if="!isDealer">提前开票</el-button>
           <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.examineStatus !== 'OK' || detailData.directTransferStatus === true" v-if="!isDealer">直调发货</el-button>
           <el-button type="primary" @click="handleFinish" :disabled="detailData.examineStatus !== 'OK'" v-if="!isDealer">直调完成</el-button>
-          <el-button @click="goBack">关 闭</el-button>
+          <el-button @click="goBack">返回列表</el-button>
         </div>
       </div>
     </div>
@@ -209,7 +209,7 @@
         <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="直调数量" prop="adjustNum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.adjustNum" size="small" type="number" :disabled="!scope.row.isDirectTransfer"></el-input>
+            <el-input v-model="scope.row.adjustNum" size="small" type="number" @mousewheel.native.prevent :disabled="!scope.row.isDirectTransfer"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>

src/views/supply/retail/components/retail_examine.vue

@@ -159,7 +159,7 @@
           :loading="formLoading"
           >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
         >
-        <el-button @click="goBack">关闭页面</el-button>
+        <el-button @click="goBack">返回列表</el-button>
       </div>
     </div>
   </div>

src/views/supply/retail/components/retail_form.vue

@@ -104,13 +104,13 @@
            </el-table-column> -->
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" @mousewheel.native.prevent v-if="listItem && !isDealer"></el-input>
             <div v-else>{{scope.row.price | numToFixed}}</div>
           </template>
         </el-table-column>
         <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.qty" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="订单金额" prop="compute_amount" min-width="100" show-overflow-tooltip>

src/views/supply/retail/components/retail_return.vue

@@ -106,7 +106,7 @@
         <el-table-column align="right" label="可退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="退订数量" prop="tdQty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.tdQty" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.tdQty" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
@@ -137,7 +137,7 @@
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
-        <el-button @click="goBack">关 闭</el-button>
+        <el-button @click="goBack">返回列表</el-button>
       </div>
     </div>
 

src/views/supply/return/components/return_form.vue

@@ -28,7 +28,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        
+
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="经销商编号" prop="jxsNum">
             <el-input v-model="mainForm.jxsNum" readonly></el-input>
@@ -80,7 +80,7 @@
         <el-table-column align="center" label="可退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="退货数量" prop="num" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.num" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.num" size="small" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
@@ -90,7 +90,7 @@
         </el-table-column>
       </el-table>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
@@ -163,7 +163,7 @@
           </div>
         </div>
       </div>
-      
+
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
         <el-button type="primary" @click="submitAddGoods">确 定</el-button>
@@ -222,7 +222,7 @@ export default {
       currentPage: 1,
       listTotal: 0,
       dealerList: [],
-      
+
       tableGoodsList: [],
       tableSelection: [],
     }
@@ -438,4 +438,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/sales/components/sales_return_form.vue

@@ -78,7 +78,7 @@
         <el-table-column align="right" label="可退数量" prop="refundableQty" min-width="80" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.invoiceNum" size="mini" type="number"></el-input>
+            <el-input v-model="scope.row.invoiceNum" size="mini" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="left" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>