From 9acb94a83fdb65678c08b25a310fe41af6f8fca2 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 03 十二月 2025 13:50:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
index 904eeec..bff4cbb 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
@@ -435,18 +435,18 @@
         </el-table-column>
         <el-table-column align="center" label="浠撳簱" width="120">
           <template slot-scope="scope">
-            <el-input-number
-              v-model="scope.row.HQty"
+            <el-input
+              v-model="scope.row.浠撳簱"
               :min="1"
               style="width: 90px"
               controls-position="right"
-            ></el-input-number>
+            ></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="鏁伴噺2" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="scope.row.HPrice"
+              v-model="scope.row.HQty"
               :min="0"
               style="width: 90px"
               controls-position="right"
@@ -455,22 +455,22 @@
         </el-table-column>
         <el-table-column align="center" label="鍗曚环" width="120">
           <template slot-scope="scope">
-            <span>{{ scope.row.HTaxPrice }}</span>
+            <span>{{ scope.row.HPrice }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="鍔犵◣鍚堣" width="120">
+        <el-table-column align="center" label="浠风◣鍚堣" width="120">
           <template slot-scope="scope">
-            <span>{{ scope.row.HTaxRate }}</span>
+            <span>{{ scope.row.HTaxMoney }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="瀹㈡埛瑙勬牸鍨嬪彿" width="120">
           <template slot-scope="scope">
-            <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
+            <span>{{ scope.row.HPrice * scope.row.瑙勬牸鍨嬪彿 }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="浜よ揣鏃ユ湡" width="120">
           <template slot-scope="scope">
-            <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
+            <span>{{ scope.row.HTaxPrice * scope.row.HDate }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="澶囨敞" width="120">
@@ -648,8 +648,8 @@
     getdata() {
       this.HInterID2 = this.$route.query.HInterID || this.linterid || 0;
       this.OperationType2 = this.$route.query.OperationType || this.OperationType || 1;
-      this.CopyType2 = this.$route.query.copyType || this.copyType || -1;
-      console.log(this.CopyType2, this.OperationType2, this.HInterID2);
+      this.CopyType2 = this.$route.query.CopyType || this.copyType || -1;
+      console.log("浼犻�掔殑鍙傛暟",this.$route.query.CopyType,this.$route.query.OperationType, this.$route.query.HInterID);
       this.formShow = false;
       this.formLoading = true;
 
@@ -712,7 +712,7 @@
                     HMoney: dataArray[i].閲戦.toFixed(2),
                     HTaxMoney: dataArray[i].浠风◣鍚堣.toFixed(2),
                     HWHID: dataArray[i].HWHID,
-                    鍙戣揣浠撳簱: dataArray[i].HWHName,
+                    浠撳簱: dataArray[i].HWHName,
                     HRemark: "",
                     HQty_Full: "0",
                     HQty_Empty: "0",

--
Gitblit v1.9.1