Quellcode durchsuchen

添加订单列表确定

sakura vor 1 Jahr
Ursprung
Commit
89d81706c7

+ 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.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>
+    // 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.ff1d1a8f34fd55bf9884.js></script><script type=text/javascript src=/static/js/vendor.d57e793ff4adf5dd9683.js></script><script type=text/javascript src=/static/js/app.56d7331098536b64867d.js></script></body></html>

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
manager-admin/dist/static/js/19.f2551a8b0072eeb421ce.js


BIN
manager-admin/dist/static/js/19.f2551a8b0072eeb421ce.js.gz


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
manager-admin/dist/static/js/20.9153672c2ea055f1ef14.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
manager-admin/dist/static/js/20.b2bb9cbb3ed806ed5f59.js


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


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
manager-admin/dist/static/js/8.fea954c99853655aa500.js


BIN
manager-admin/dist/static/js/8.fea954c99853655aa500.js.gz


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
manager-admin/dist/static/js/9.ca01821442996c5571f1.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
manager-admin/dist/static/js/9.eff2bec016814b8b031d.js


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


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
manager-admin/dist/static/js/app.56d7331098536b64867d.js


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


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
manager-admin/dist/static/js/manifest.ff1d1a8f34fd55bf9884.js


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

@@ -14,6 +14,7 @@
             v-model="goodsExchangeAddForm.sn"
             :disabled="type === 'detail' || type === 'audit'"
             ref="order"
+            @keyup.enter.native="blurUsername()"
           >
           </el-input>
           <el-button @click="blurUsername()">搜索</el-button>
@@ -173,8 +174,8 @@
             </el-table-column>-->
             <el-table-column label="差异">
               <template slot-scope="scope">
-                <span v-if="scope.row.sn_code_list">{{
-                  scope.row.num - scope.row.sn_code_list.length || 0
+                <span v-if="scope.row.orderNum">{{
+                  scope.row.num - scope.row.orderNum || 0
                 }}</span>
               </template>
             </el-table-column>
@@ -340,7 +341,8 @@
         :data="orderList.data"
         border
         style="width: 100%"
-        @selection-change="handleSelectionChange"
+        ref="tables"
+        @selection-change="handleSelOrderChange"
       >
         <el-table-column type="selection" width="55" />
         <el-table-column prop="" label="订单编号">
@@ -397,7 +399,7 @@
       </el-pagination>
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeOrder">取 消</el-button>
-        <el-button type="primary">确 定</el-button>
+        <el-button @click="searchOrderAdd" type="primary">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -581,6 +583,7 @@ export default {
       sku: "",
       sn_code_list: [],
       index: "",
+      snMultipleSelection:''
     };
   },
   mounted() {
@@ -635,6 +638,16 @@ export default {
     ...mapGetters(["user"]),
   },
   methods: {
+    /* 订单列表选择 */
+    handleSelOrderChange(val){
+      if (val.length > 1) {
+        // 如果当前选中数量超过1,移除先前选中的,保留最后选中的
+        const lastSelected = val[val.length - 1];
+        this.$refs.tables.clearSelection(); // 清除所有选中
+        this.$refs.tables.toggleRowSelection(lastSelected, true); // 重新选中最后一个
+      }
+      this.snMultipleSelection=val
+    },
     /* 返回出入明细 */
     toBack() {
       this.$router.push({
@@ -766,6 +779,28 @@ export default {
         });
       }
     },
+    searchOrderAdd(){
+      if (this.snMultipleSelection.length >=1) {
+        API_GoodsExchange.getOneBySn(this.snMultipleSelection[0].sn).then(
+          (res) => {
+            this.goodsExchangeAddForm.scan_order_sn=this.snMultipleSelection[0].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.num=0
+              el.sn_code_list=[]
+            })
+            this.goodsExchangeAddForm.product_list=res.item_list
+            this.orderVisible=false
+          }
+        );
+      }else{
+        this.$message.error("请选择订单")
+      }
+    },
     // 查询订单编号
     blurUsername() {
       if (this.goodsExchangeAddForm.sn !== undefined) {
@@ -778,14 +813,15 @@ export default {
               el.scan_order_item_id=el.id
               el.scan_order_id=res.id
               el.orderNum=el.num
+              el.num=0
               el.sn_code_list=[]
             })
             this.goodsExchangeAddForm.product_list=res.item_list
           }
         );
-      } /* else{
+      } else{
         this.$message.error("请填写订单编号")
-      } */
+      }
     },
     /* 通过id查询商品信息
     orderInfo(id){

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

@@ -314,7 +314,7 @@ export default {
       // 创建一个canvas节点
       const canvas = document.createElement("canvas");
 
-      const scale = 4; // 定义任意放大倍数,支持小数;越大,图片清晰度越高,生成图片越慢。
+      const scale = 1; // 定义任意放大倍数,支持小数;越大,图片清晰度越高,生成图片越慢。
       canvas.width = width * scale; // 定义canvas 宽度 * 缩放
       canvas.height = height * scale; // 定义canvas高度 *缩放
       canvas.style.width = width * scale + "px";

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.