src/api/lease/out.js

@@ -10,11 +10,10 @@ export function getListLeaseOut(query) {
 }
 
 // 领料出库-出库详情信息
-export function outInfoList(id,query) {
+export function outInfoList(id) {
   return request({
     url: '/material/lease_apply_info/' + id,
-    method: 'get',
-    params: query,
+    method: 'get'
   })
 }
 

src/views/material/back/component/queryReturn.vue

@@ -126,12 +126,12 @@
             :data="equipmentList"
             @selection-change="handleSelectionChange"
         >
-            <!-- <el-table-column
+            <el-table-column
                 type="selection"
                 min-width="55"
                 align="center"
                 :selectable="selectable"
-            /> -->
+            />
             <el-table-column label="序号" type="index" align="center" min-width="80" />
             <el-table-column
                 label="类型名称"

src/views/material/lease/outBound/index.vue

@@ -238,11 +238,12 @@
         v-show="showSearch"
         label-width="68px"
       >
-        <el-form-item prop="keyWord">
+        <el-form-item prop="typeId">
           <el-input
-            v-model="queryOutInfo.keyWord"
+            v-model="queryOutInfo.typeId"
             placeholder="请输入规格型号"
-            clearable 
+            clearable
+            @keyup.enter.native="handleQueryOutInfo"
             maxlength="20"
           />
         </el-form-item>
@@ -336,11 +337,12 @@
         v-show="showSearch"
         label-width="68px"
       >
-        <el-form-item prop="keyWord">
+        <el-form-item prop="typeId">
           <el-input
-            v-model="queryOutView.keyWord"
+            v-model="queryOutView.typeId"
             placeholder="请输入规格型号"
-            clearable 
+            clearable
+            @keyup.enter.native="handleQueryOutInfo"
             maxlength="20"
           />
         </el-form-item>
@@ -349,13 +351,13 @@
             type="primary"
             icon="el-icon-search"
             size="mini"
-            @click="handleQueryOutView"
+            @click="handleQueryOutInfo"
             >查询</el-button
           >
-          <el-button 
+          <el-button
             icon="el-icon-refresh"
             size="mini"
-            @click="resetQueryOutView"
+            @click="resetQueryOutInfo"
             >重置</el-button
           >
         </el-form-item>
@@ -1002,59 +1004,49 @@ export default {
       this.queryParams.keyWord = "";
       this.handleQuery();
     },
+    //出库搜索按钮
+    handleQueryOutInfo() {
+      this.queryOutInfo.pageNum = 1;
+      this.getDialogList();
+    },
+    resetQueryOutInfo() {
+      this.queryOutInfo.typeId=""
+      this.getDialogList();
+    },
+    getListView() {
+      outInfoList(this.queryOutView.id).then((response) => {
+        this.getListOutInfo = response.data.leaseApplyDetailsList;
+        // this.dialogTotal = response.
+        // this.loading = false;
+      });
+    },
 
+    /** 出库查询列表 */
+    getDialogList() {
+      outInfoList(this.queryOutInfo.id).then((response) => {
+        this.getListOutInfo = response.data.leaseApplyDetailsList;
+        // this.dialogTotal = response.
+        // this.loading = false;
+      });
+    },
+    
 
     /** 查看按钮操作 */
     handleView(row) {
       this.title = "查看";
       this.showOutView = true;
       this.queryOutView.id = row.id;
-      outInfoList(row.id,{keyWord:this.queryOutView.keyWord}).then((response) => {
+      outInfoList(row.id).then((response) => {
         this.getListOutInfo = response.data.leaseApplyDetailsList;
         // this.loading = false;
       });
     },
-    //查看
-    handleQueryOutView(){
-      this.queryOutView.pageNum = 1;
-      this.getListView();
-    },
-    resetQueryOutView() {
-      this.queryOutView.keyWord=""
-      this.getListView();
-    },
-    getListView() {
-      outInfoList(this.queryOutView.id,{keyWord:this.queryOutView.keyWord}).then((response) => {
-        this.getListOutInfo = response.data.leaseApplyDetailsList;
-        // this.dialogTotal = response.
-        // this.loading = false;
-      });
-    },
-    /** 出库查询列表 */
-    getDialogList() {
-      outInfoList(this.queryOutInfo.id,{keyWord:this.queryOutInfo.keyWord}).then((response) => {
-        this.getListOutInfo = response.data.leaseApplyDetailsList;
-        // this.dialogTotal = response.
-        // this.loading = false;
-      });
-    }, 
-    //出库搜索按钮
-    handleQueryOutInfo() {
-      this.queryOutInfo.pageNum = 1;
-      this.getDialogList();
-    },
-    //出库搜索按钮
-    resetQueryOutInfo() {
-      this.queryOutInfo.keyWord=""
-      this.getDialogList();
-    },  
-
     /** 出库按钮操作 */
     handleOut(row) {
       this.title = "出库";
       this.showOutInfo = true;
       this.queryOutInfo.id = row.id;
-      outInfoList(row.id,{keyWord:this.queryOutInfo.keyWord}).then((response) => {
+      outInfoList(row.id).then((response) => {
         this.getListOutInfo = response.data.leaseApplyDetailsList;
         // this.loading = false;
       });

src/views/material/purchase/goodsArrived/component/addTools.vue

@@ -145,7 +145,7 @@
                         v-model="scope.row.purchaseTaxPrice"
                         controls-position="right"
                         style="width: 100%"
-                        :min="0" disabled
+                        :min="0"
                         @change="purchaseTaxPriceChange(scope.row,scope.$index)"
                     ></el-input-number>
                 </template>
@@ -456,13 +456,14 @@ export default {
             })
         },
         // 含税单价
-        purchaseTaxPriceChange(row,val){ 
-            row.purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(4)
-            // row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(3)
+        purchaseTaxPriceChange(row,val){
+            // this.equipmentList[val].purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(2)
+            row.purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(3)
         },
         // 不含税单价
-        purchasePriceChange(row,val){ 
-            row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(4)
+        purchasePriceChange(row,val){
+            // this.equipmentList[val].purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(2)
+            row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(3)
         },
         /** 物资厂家-下拉选 */
         supplierInfoList() {