Переглянути джерело

修改出入明细及隐藏处理按钮,最新打包

sakura 1 рік тому
батько
коміт
0196b12d2b
64 змінених файлів з 91 додано та 28 видалено
  1. 1 1
      manager-admin/dist/index.html
  2. 0 0
      manager-admin/dist/static/css/app.e7b0e510a33bb83825df6634ccfde84a.css
  3. BIN
      manager-admin/dist/static/css/app.e7b0e510a33bb83825df6634ccfde84a.css.gz
  4. 0 0
      manager-admin/dist/static/js/0.01137a2c0653e30f093c.js
  5. BIN
      manager-admin/dist/static/js/0.01137a2c0653e30f093c.js.gz
  6. 0 0
      manager-admin/dist/static/js/10.13fb3a59d5eb7e3f7bd4.js
  7. BIN
      manager-admin/dist/static/js/10.13fb3a59d5eb7e3f7bd4.js.gz
  8. 0 0
      manager-admin/dist/static/js/10.ec31a19d9995039a8d3a.js
  9. BIN
      manager-admin/dist/static/js/10.ec31a19d9995039a8d3a.js.gz
  10. 0 0
      manager-admin/dist/static/js/2.743cb73485bc820b98a2.js
  11. BIN
      manager-admin/dist/static/js/2.743cb73485bc820b98a2.js.gz
  12. 0 0
      manager-admin/dist/static/js/2.cb0d2e3344e429ddebaa.js
  13. BIN
      manager-admin/dist/static/js/2.cb0d2e3344e429ddebaa.js.gz
  14. 0 0
      manager-admin/dist/static/js/20.b2bb9cbb3ed806ed5f59.js
  15. BIN
      manager-admin/dist/static/js/20.b2bb9cbb3ed806ed5f59.js.gz
  16. BIN
      manager-admin/dist/static/js/20.fec9414c42a277779360.js.gz
  17. 0 0
      manager-admin/dist/static/js/25.0431573121e1cc9daffe.js
  18. 0 0
      manager-admin/dist/static/js/25.fcb6583341b91631e6e7.js
  19. 0 0
      manager-admin/dist/static/js/26.6f95397a84cc39a5431e.js
  20. BIN
      manager-admin/dist/static/js/26.6f95397a84cc39a5431e.js.gz
  21. 0 0
      manager-admin/dist/static/js/26.e69c33239d16d7a4df9c.js
  22. BIN
      manager-admin/dist/static/js/26.e69c33239d16d7a4df9c.js.gz
  23. 0 0
      manager-admin/dist/static/js/27.080651ade43c92a57590.js
  24. BIN
      manager-admin/dist/static/js/27.080651ade43c92a57590.js.gz
  25. 0 0
      manager-admin/dist/static/js/27.0f297d3fe496bf07d409.js
  26. BIN
      manager-admin/dist/static/js/27.0f297d3fe496bf07d409.js.gz
  27. BIN
      manager-admin/dist/static/js/28.33ec8dd1e11efb7fa25d.js.gz
  28. 0 0
      manager-admin/dist/static/js/28.7b8dc463284ca98d57ee.js
  29. BIN
      manager-admin/dist/static/js/28.7b8dc463284ca98d57ee.js.gz
  30. 0 0
      manager-admin/dist/static/js/31.31330a2b78da462466d6.js
  31. BIN
      manager-admin/dist/static/js/31.31330a2b78da462466d6.js.gz
  32. 0 0
      manager-admin/dist/static/js/31.5061698cd9272e156a64.js
  33. BIN
      manager-admin/dist/static/js/31.5061698cd9272e156a64.js.gz
  34. 0 0
      manager-admin/dist/static/js/39.8f56ed4f21ac5b4d0fdc.js
  35. BIN
      manager-admin/dist/static/js/39.8f56ed4f21ac5b4d0fdc.js.gz
  36. 0 0
      manager-admin/dist/static/js/39.be6e466de162c5fef2f4.js
  37. BIN
      manager-admin/dist/static/js/40.1f396f6928fa20157a79.js.gz
  38. 0 0
      manager-admin/dist/static/js/40.aeb246ace5716b898476.js
  39. 0 0
      manager-admin/dist/static/js/41.6a88cf01c848c834cbb8.js
  40. 0 0
      manager-admin/dist/static/js/42.f2c74e1bfb838352e333.js
  41. BIN
      manager-admin/dist/static/js/42.f2c74e1bfb838352e333.js.gz
  42. 0 0
      manager-admin/dist/static/js/43.6306a657fa03aaa42291.js
  43. BIN
      manager-admin/dist/static/js/43.7aaddcf4b21b9fcec5c3.js.gz
  44. 0 0
      manager-admin/dist/static/js/6.87f020e42a0c8b859303.js
  45. BIN
      manager-admin/dist/static/js/6.87f020e42a0c8b859303.js.gz
  46. 0 0
      manager-admin/dist/static/js/6.b10d424fb92c7cae0e29.js
  47. BIN
      manager-admin/dist/static/js/6.b10d424fb92c7cae0e29.js.gz
  48. 0 0
      manager-admin/dist/static/js/9.b3af282fead47e2113d6.js
  49. BIN
      manager-admin/dist/static/js/9.b3af282fead47e2113d6.js.gz
  50. 0 0
      manager-admin/dist/static/js/9.eff2bec016814b8b031d.js
  51. BIN
      manager-admin/dist/static/js/9.eff2bec016814b8b031d.js.gz
  52. 0 0
      manager-admin/dist/static/js/app.9f62a94a1b09b84ecb74.js
  53. BIN
      manager-admin/dist/static/js/app.9f62a94a1b09b84ecb74.js.gz
  54. 0 0
      manager-admin/dist/static/js/manifest.382453ba21d80066b6d0.js
  55. 10 0
      manager-admin/src/api/goodsExchange.js
  56. 5 0
      manager-admin/src/components/SkuEditor/src/main.vue
  57. 2 2
      manager-admin/src/styles/element-ui.scss
  58. 21 8
      manager-admin/src/views/setting/serialList.vue
  59. 16 6
      manager-admin/src/views/stock/goodsExchange/addInventory.vue
  60. 4 4
      manager-admin/src/views/stock/goodsExchange/checkInventory.vue
  61. 14 2
      manager-admin/src/views/stock/goodsExchange/goodsExchange.vue
  62. 2 2
      manager-admin/src/views/stock/goodsInventory/goodsInventory.vue
  63. 2 2
      manager-admin/src/views/stock/goodsUnderstock.vue
  64. 14 1
      manager-admin/src/views/stock/orderAdd.vue

+ 1 - 1
manager-admin/dist/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html><head><meta charset=utf-8><script>var ua = window.navigator.userAgent
     var isIe = /MSIE|Trident/.test(ua)
-    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.968092023a2397e10c45907b698b9fce.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.27890fef0aecc9298bcc.js></script><script type=text/javascript src=/static/js/vendor.d57e793ff4adf5dd9683.js></script><script type=text/javascript src=/static/js/app.a9c31efb49fb1ee0c2d5.js></script></body></html>
+    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.e7b0e510a33bb83825df6634ccfde84a.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.382453ba21d80066b6d0.js></script><script type=text/javascript src=/static/js/vendor.d57e793ff4adf5dd9683.js></script><script type=text/javascript src=/static/js/app.9f62a94a1b09b84ecb74.js></script></body></html>

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/css/app.e7b0e510a33bb83825df6634ccfde84a.css


BIN
manager-admin/dist/static/css/app.968092023a2397e10c45907b698b9fce.css.gz → manager-admin/dist/static/css/app.e7b0e510a33bb83825df6634ccfde84a.css.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/0.01137a2c0653e30f093c.js


BIN
manager-admin/dist/static/js/0.bd09e1711e49853e26d6.js.gz → manager-admin/dist/static/js/0.01137a2c0653e30f093c.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/10.13fb3a59d5eb7e3f7bd4.js


BIN
manager-admin/dist/static/js/10.13fb3a59d5eb7e3f7bd4.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/10.ec31a19d9995039a8d3a.js


BIN
manager-admin/dist/static/js/10.ec31a19d9995039a8d3a.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/2.743cb73485bc820b98a2.js


BIN
manager-admin/dist/static/js/2.743cb73485bc820b98a2.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/2.cb0d2e3344e429ddebaa.js


BIN
manager-admin/dist/static/js/2.cb0d2e3344e429ddebaa.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/20.b2bb9cbb3ed806ed5f59.js


BIN
manager-admin/dist/static/js/20.b2bb9cbb3ed806ed5f59.js.gz


BIN
manager-admin/dist/static/js/20.fec9414c42a277779360.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/25.0431573121e1cc9daffe.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/25.fcb6583341b91631e6e7.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/26.6f95397a84cc39a5431e.js


BIN
manager-admin/dist/static/js/26.6f95397a84cc39a5431e.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/26.e69c33239d16d7a4df9c.js


BIN
manager-admin/dist/static/js/26.e69c33239d16d7a4df9c.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/27.080651ade43c92a57590.js


BIN
manager-admin/dist/static/js/27.080651ade43c92a57590.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/27.0f297d3fe496bf07d409.js


BIN
manager-admin/dist/static/js/27.0f297d3fe496bf07d409.js.gz


BIN
manager-admin/dist/static/js/28.33ec8dd1e11efb7fa25d.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/28.7b8dc463284ca98d57ee.js


BIN
manager-admin/dist/static/js/28.7b8dc463284ca98d57ee.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/31.31330a2b78da462466d6.js


BIN
manager-admin/dist/static/js/31.31330a2b78da462466d6.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/31.5061698cd9272e156a64.js


BIN
manager-admin/dist/static/js/31.5061698cd9272e156a64.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/39.8f56ed4f21ac5b4d0fdc.js


BIN
manager-admin/dist/static/js/39.8f56ed4f21ac5b4d0fdc.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/39.be6e466de162c5fef2f4.js


BIN
manager-admin/dist/static/js/40.1f396f6928fa20157a79.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/40.aeb246ace5716b898476.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/41.6a88cf01c848c834cbb8.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/42.f2c74e1bfb838352e333.js


BIN
manager-admin/dist/static/js/42.f2c74e1bfb838352e333.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/43.6306a657fa03aaa42291.js


BIN
manager-admin/dist/static/js/43.7aaddcf4b21b9fcec5c3.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/6.87f020e42a0c8b859303.js


BIN
manager-admin/dist/static/js/6.87f020e42a0c8b859303.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/6.b10d424fb92c7cae0e29.js


BIN
manager-admin/dist/static/js/6.b10d424fb92c7cae0e29.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/9.b3af282fead47e2113d6.js


BIN
manager-admin/dist/static/js/9.b3af282fead47e2113d6.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/9.eff2bec016814b8b031d.js


BIN
manager-admin/dist/static/js/9.eff2bec016814b8b031d.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/app.9f62a94a1b09b84ecb74.js


BIN
manager-admin/dist/static/js/app.a9c31efb49fb1ee0c2d5.js.gz → manager-admin/dist/static/js/app.9f62a94a1b09b84ecb74.js.gz


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
manager-admin/dist/static/js/manifest.382453ba21d80066b6d0.js


+ 10 - 0
manager-admin/src/api/goodsExchange.js

@@ -281,3 +281,13 @@ export function getSnCode(type,sku,snCode) {
     loaidng: false
   })
 }
+
+/* 订单扫描 */
+
+export function getOneBySn(orderCode) {
+  return request({
+    url: `/admin/erp/order/getOneBySn/${orderCode}`,
+    method: 'get',
+    loaidng: false
+  })
+}

+ 5 - 0
manager-admin/src/components/SkuEditor/src/main.vue

@@ -407,6 +407,11 @@ export default {
     }
   },
   methods: {
+    preventChineseInput(row,event) {
+      console.log(row,event);
+    return event = event.replace(/[\u4e00-\u9fa5]/g, '');
+
+  },
     updateInternalStateBasedOnBasicInfo(data) {
       // 假设 basicInfoData 包含 'haveSpec' 和 'haveSn' 字段
       if (data) {

+ 2 - 2
manager-admin/src/styles/element-ui.scss

@@ -76,6 +76,6 @@
    background-color: #F56C6C;
    border-color: #F56C6C;
  }
-  .el-table{
+  /* .el-table{
   min-height: 530px !important;
- }
+ } */

+ 21 - 8
manager-admin/src/views/setting/serialList.vue

@@ -41,7 +41,6 @@
       :loading="loading"
       @selection-change="handleSelectionChange"
     >
-
       <div slot="toolbar" class="inner-toolbar">
         <div class="toolbar-btns">
           <el-button
@@ -66,7 +65,7 @@
             >批量打印</el-button
           >
         </div>
-<!--
+        <!--
         <div class="toolbar-search" style="display: flex; align-items: center">
 
           <span>商品编号/条码:</span>
@@ -222,8 +221,11 @@
         <div class="tips-t" v-for="(item, index) in codeList" :key="index">
           <div>
             <!-- <div class="qrcode-pic" ref="codeItem" ></div> -->
+            <div class="numOrder">
+
+            </div>
             <div style="margin-top: 10px; font-size: 20px; text-align: center">
-              {{ item }}
+              <barcode :value="item"  format="CODE128"></barcode>
             </div>
           </div>
         </div>
@@ -276,9 +278,10 @@ export default {
       // 新增窗口选中的值
       snMultipleSelection: [],
       title: "",
-      statusList:[],
+      statusList: [],
       // 高级搜索数据
       advancedForm: {},
+      barcodeValue: "",
     };
   },
   mounted() {
@@ -287,6 +290,9 @@ export default {
     // this.GET_StationAllList()
     this.GET_AdministratorList();
   },
+  watch: {
+
+},
   computed: {
     ...mapGetters(["user"]),
   },
@@ -334,8 +340,11 @@ export default {
     },
     // 打印
     PrintIng(row) {
-      this.PrintVisible = true;
-      this.codeList.push(row.sn_code);
+      this.barcodeValue = row.sn_code;
+      this.$nextTick(() => {
+        this.codeList.push(row.sn_code);
+        this.PrintVisible = true;
+      });
     },
     // 删除
     handleDelectWarehous() {
@@ -473,7 +482,7 @@ export default {
     searchEvent(data) {
       this.params = {
         ...this.params,
-        ...this.advancedForm
+        ...this.advancedForm,
       };
       this.params.page_no = 1;
       this.GET_WarehouseList();
@@ -490,7 +499,7 @@ export default {
         .catch(() => {
           this.loading = false;
         });
-        API_Setting.getPage({ dictType: "sn_code_status" }).then((res) => {
+      API_Setting.getPage({ dictType: "sn_code_status" }).then((res) => {
         this.statusList = res.data;
       });
     },
@@ -553,4 +562,8 @@ export default {
     margin-left: 20px;
   }
 }
+.numOrder {
+    display: flex;
+    justify-content: center;
+  }
 </style>

+ 16 - 6
manager-admin/src/views/stock/goodsExchange/addInventory.vue

@@ -11,7 +11,7 @@
       <el-form-item label="订单" prop="order_id" class="change-form-item">
         <span>
           <el-input
-            v-model="goodsExchangeAddForm.order_id"
+            v-model="goodsExchangeAddForm.sn"
             :disabled="type === 'detail' || type === 'audit'"
             ref="order"
           >
@@ -53,6 +53,7 @@
             :key="item.id"
             :label="item.label"
             :value="item.value"
+            :disabled="item.value=='TRANSFER_ENTRY'"
           />
         </el-select>
       </el-form-item>
@@ -768,12 +769,18 @@ export default {
     // 查询订单编号
     blurUsername() {
       if (this.goodsExchangeAddForm.sn !== undefined) {
-        API_order.getOrderList({ sn: this.goodsExchangeAddForm.order_id }).then(
+        API_GoodsExchange.getOneBySn(this.goodsExchangeAddForm.sn).then(
           (res) => {
-            console.log(res.data);
-            if (res.data.length !== 0) return;
-            this.goodsExchangeAddForm.order_id = Number(res.data[0].id);
-            this.goodsExchangeAddForm.contract_product_list = res.data;
+            this.goodsExchangeAddForm.scan_order_sn=this.goodsExchangeAddForm.sn
+            this.goodsExchangeAddForm.scan_order_type=res.type
+            this.goodsExchangeAddForm.order_id=res.id
+            res.item_list.map(el=>{
+              el.scan_order_item_id=el.id
+              el.scan_order_id=res.id
+              el.orderNum=el.num
+              el.sn_code_list=[]
+            })
+            this.goodsExchangeAddForm.product_list=res.item_list
           }
         );
       } /* else{
@@ -978,6 +985,9 @@ export default {
             el.product_stock_id = el.id;
             el.product_id = el.product_vo.id;
             el.id = "";
+            if(!el.orderNum){
+              el.scan_diff_num=el.orderNum-el.num
+            }
           });
           if (this.$route.name === "editInventory") {
             API_GoodsExchange.editWarehouseEntry(id, params).then(

+ 4 - 4
manager-admin/src/views/stock/goodsExchange/checkInventory.vue

@@ -18,11 +18,11 @@
       >
         <el-form-item
           label="订单:"
-          prop="order_id"
+          prop="sn"
           class="change-form-item"
           v-if="checkType == 'second'"
         >
-          {{ goodsExchangeAddForm.order_id }}
+          {{ goodsExchangeAddForm.sn }}
         </el-form-item>
         <el-form-item
           v-if="checkType == 'first'"
@@ -416,7 +416,7 @@ export default {
             this.goodsExchangeAddForm = response;
             this.barcodeValue = response.sn;
             this.goodsExchangeAddForm.distribution_name = response.staff_name;
-            this.goodsExchangeAddForm.product_list = response.product_list.map(
+            this.goodsExchangeAddForm.product_list = response.product_list/* .map(
               (item) => {
                 item.name = item.goods_do.name;
                 item.sn = item.goods_do.sn;
@@ -429,7 +429,7 @@ export default {
                 item.usable_stock = item.goods_do.usable_stock;
                 return item;
               }
-            );
+            ); */
           });
         }
       });

+ 14 - 2
manager-admin/src/views/stock/goodsExchange/goodsExchange.vue

@@ -269,6 +269,7 @@ export default {
 
     handleClick(tab, event) {
       this.activeName = tab.name;
+      this.params.page_no=1
       if (tab.name == "first") {
         this.GET_GoodsExchangeList();
       } else {
@@ -395,13 +396,21 @@ export default {
     /** 分页大小发生改变 */
     handlePageSizeChange(size) {
       this.params.page_size = size;
-      this.GET_GoodsExchangeList();
+      if (this.activeName == "first") {
+        this.GET_GoodsExchangeList();
+      } else {
+        this.GET_WarehouseEntry();
+      }
     },
 
     /** 分页页数发生改变 */
     handlePageCurrentChange(page) {
       this.params.page_no = page;
-      this.GET_GoodsExchangeList();
+      if (this.activeName == "first") {
+        this.GET_GoodsExchangeList();
+      } else {
+        this.GET_WarehouseEntry();
+      }
     },
     // 新增出库
     handleShiftGoodsExchange() {
@@ -553,4 +562,7 @@ export default {
 /deep/ .el-dialog__body {
   padding: 10px 20px;
 }
+.el-table{
+  min-height: 500px !important;
+ }
 </style>

+ 2 - 2
manager-admin/src/views/stock/goodsInventory/goodsInventory.vue

@@ -85,9 +85,9 @@
           <template slot-scope="scope">
             <el-button  size="mini"
               @click="handleCheckGoodsInventory(scope.row)">查看</el-button>
-              <el-button type="mini"
+               <!--<el-button type="mini"
               size="mini" v-if="scope.row.status=='NOT_HANDLE'" @click="handleSubmitGoodsInventory(scope.row)">处理</el-button>
-            <!-- <el-button v-if="scope.row.allowable.allow_audit && checkPermission(['goodsInventory:audit'])" type="mini"
+            <el-button v-if="scope.row.allowable.allow_audit && checkPermission(['goodsInventory:audit'])" type="mini"
               size="mini" @click="handleAuditGoodsInventory(scope.row)">审核</el-button>
 
             <el-button v-if="scope.row.allowable.allow_cancel && checkPermission(['goodsInventory:cancel'])" type="mini"

+ 2 - 2
manager-admin/src/views/stock/goodsUnderstock.vue

@@ -102,8 +102,8 @@
         </el-table-column>
         <el-table-column label="操作" width="250">
           <template slot-scope="scope">
-             <el-button size="mini" v-if="scope.row.status!=='ROLLBACK_HANDLE'"
-              @click="handleSuccessGoodsTransfer(scope.row)" type="success">撤销</el-button>
+             <!-- <el-button size="mini" v-if="scope.row.status!=='ROLLBACK_HANDLE'"
+              @click="handleSuccessGoodsTransfer(scope.row)" type="success">撤销</el-button> -->
              <el-button  size="mini"
               @click="handleSubmitGoodsTransfer(scope.row)">查看</el-button>
           <!--  <el-button type="danger" size="mini"v-if="scope.row.allowable.submit && checkPermission(['goodsTransfer:submit'])"

+ 14 - 1
manager-admin/src/views/stock/orderAdd.vue

@@ -207,6 +207,16 @@
             ></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="10">
+          <el-form-item
+            label="允许负库存"
+          >
+          <el-radio-group v-model="OrderForm.subtract_stock">
+            <el-radio :label="false">禁止</el-radio>
+            <el-radio :label="true">允许</el-radio>
+          </el-radio-group>
+          </el-form-item>
+        </el-col>
         <el-col :span="10">
           <div class="redClass">
             <el-form-item label="备注" prop="remark">
@@ -543,6 +553,7 @@ const initOrderForm = {
   pay_price: 0,
   deposit_price: 0,
   send_type: "express",
+  subtract_stock: false,
   payment_status: "NOT_PAY",
 };
 
@@ -577,6 +588,7 @@ export default {
         //详细信息
         address: "",
         province_city_area_address: "",
+        subtract_stock: false,
         warehouse_id:[],
       },
       formLoading: false,
@@ -770,6 +782,7 @@ export default {
     ...mapGetters(["user"]),
   },
   mounted() {
+    console.log(this.OrderForm);
     this.GET_WarehouseList();
     this.GET_MemberList();
     this.GET_MarketingList();
@@ -1340,7 +1353,7 @@ export default {
     discount: {
       deep: true,
       handler(newVal) {
-        this.OrderForm.pay_price = this.price * newVal/10;
+        this.OrderForm.real_price = this.price * newVal/10;
       },
     },
     "OrderForm.product_list": {

Деякі файли не було показано, через те що забагато файлів було змінено