Selaa lähdekoodia

【新增】采购退料 、 其他入库单、 其他出库单

howie 2 vuotta sitten
vanhempi
commit
02a41c394c

+ 3 - 3
src/api/supply/purchase.js

@@ -98,16 +98,16 @@ export function setApprovalOtherStockOut(params) {
     params,
   });
 }
-// 反审采购入库单
+// 反审其他入库单
 export function setApprovalPurchaseOrderIn(params) {
   return request({
-    url: "/stock/orderOutIn/trialApprovalPurchaseOrderIn",
+    url: "/stock/orderOutIn/trialApprovalOtherStockIn",
     method: "post",
     params,
   });
 }
 
-// 反审其他出库
+// 反审采购退料
 export function setApprovalPurchaseOrderOut(params) {
   return request({
     url: "/stock/orderOutIn/trialApprovalPurchaseOrderOut",

+ 9 - 9
src/views/basic_data/stock/Issue_list.vue

@@ -93,12 +93,12 @@
     </div>
     <div class="mymain-container">
       <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton
-            :ex-url="'admin/user/mch/export'"
-            :ex-params="exParams"
-          />
-        </div>
+        <!--        <div class="fr">-->
+        <!--          <ExportButton-->
+        <!--            :ex-url="'admin/user/mch/export'"-->
+        <!--            :ex-params="exParams"-->
+        <!--          />-->
+        <!--        </div>-->
       </div>
       <div class="table">
         <el-table
@@ -228,7 +228,7 @@
             align="left"
             label="单位"
             prop="unit"
-            min-width="300"
+            min-width="100"
             show-overflow-tooltip
           >
           </el-table-column>
@@ -286,7 +286,7 @@
 <script>
 import {
   getOtherStockInList,
-  setApprovalOtherStockOut,
+  setApprovalPurchaseOrderIn,
 } from "@/api/supply/purchase";
 import { getWarehouseList } from "@/api/supply/apply";
 
@@ -355,7 +355,7 @@ export default {
       });
     },
     handleUnapprove(id, billNo) {
-      setApprovalOtherStockOut({ id, billNo }).then((res) => {
+      setApprovalPurchaseOrderIn({ id, billNo }).then((res) => {
         this.$successMsg("弃审成功");
         this.getList();
       });

+ 1 - 1
src/views/basic_data/stock/material_list.vue

@@ -208,7 +208,7 @@
             align="left"
             label="库存单位"
             prop="unit"
-            min-width="300"
+            min-width="100"
             show-overflow-tooltip
           >
           </el-table-column>

+ 10 - 10
src/views/basic_data/stock/warehousing_list.vue

@@ -93,12 +93,12 @@
     </div>
     <div class="mymain-container">
       <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton
-            :ex-url="'admin/user/mch/export'"
-            :ex-params="exParams"
-          />
-        </div>
+        <!--        <div class="fr">-->
+        <!--          <ExportButton-->
+        <!--            :ex-url="'admin/user/mch/export'"-->
+        <!--            :ex-params="exParams"-->
+        <!--          />-->
+        <!--        </div>-->
       </div>
       <div class="table">
         <el-table
@@ -219,8 +219,8 @@
           <el-table-column
             align="left"
             label="单位"
-            prop="uom"
-            min-width="300"
+            prop="unit"
+            min-width="100"
             show-overflow-tooltip
           />
           <el-table-column
@@ -281,7 +281,7 @@
 <script>
 import {
   getOtherStockOutList,
-  setApprovalPurchaseOrderIn,
+  setApprovalOtherStockOut,
 } from "@/api/supply/purchase";
 import { getWarehouseList } from "@/api/supply/apply";
 
@@ -350,7 +350,7 @@ export default {
       });
     },
     handleUnapprove(id, billNo) {
-      setApprovalPurchaseOrderIn({ id, billNo }).then((res) => {
+      setApprovalOtherStockOut({ id, billNo }).then((res) => {
         this.$successMsg("弃审成功");
         this.getList();
       });