From 461150f9ba5b923e24cc03c655135f4ae198d8f2 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 31 Oct 2024 10:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E6=AC=A0=E6=AC=BE=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/invoicing.js                           |  2 +-
 src/layout/components/TagsView/index.vue       |  1 +
 src/views/invoicing/consumable/information.vue |  6 +++---
 src/views/invoicing/operation_in.vue           |  7 +++++++
 src/views/invoicing/operation_out.vue          | 16 +++++++++++++---
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/api/invoicing.js b/src/api/invoicing.js
index 2600bfa..e144ba4 100644
--- a/src/api/invoicing.js
+++ b/src/api/invoicing.js
@@ -71,7 +71,7 @@ export function tbProductStockDetailSum(params) {
  */
 export function tbShopPurveyorGet(params) {
   return request({
-    url: `/api/tbShopPurveyor`,
+    url: `/api/tbShopPurveyorTransact`,
     method: "get",
     params
   });
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index b3c2ffe..40845c0 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -160,6 +160,7 @@ export default {
       }
     },
     openMenu(tag, e) {
+      console.log(11111)
       const menuMinWidth = 105
       const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
       const offsetWidth = this.$el.offsetWidth // container width
diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue
index cc1b31f..0d7d761 100644
--- a/src/views/invoicing/consumable/information.vue
+++ b/src/views/invoicing/consumable/information.vue
@@ -496,11 +496,11 @@
         </div>
         <div class="unitStyle unitWidth " style="margin-top: 20px;" v-else>
           <div>副单位</div>
-          <div><input style="width: 100px;" type="text" v-model="unitItem.conUnitTwo"> </div>
+          <div><input style="width: 70px;" type="text" v-model="unitItem.conUnitTwo"> </div>
           <div style="display: flex;align-items: center;">
             <div style="width: 9px;height: 9px;background-color: #D9D9D9;border-radius: 50%;margin:0 6px;"></div> 订货单位
             <input type="text" disabled placeholder="1">
-            <div style="width: 80px;">{{ unitItem.conUnitTwo }}</div>= <input v-model="unitItem.conUnitTwoConvert"
+            <div style="width: 80px;">{{ unitItem.conUnitTwo }}</div>= <input style="width: 80px;" v-model="unitItem.conUnitTwoConvert"
               type="number">{{
                 unitItem.conUnit }}
           </div>
@@ -1377,7 +1377,7 @@ export default {
   }
 
   >div:nth-child(2) {
-    width: 120px;
+    width: 80px;
     height: 42px;
     line-height: 42px;
     text-align: center;
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 004bd02..a0870f4 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -84,6 +84,10 @@
                 </el-row>
                 <el-row>
                     <el-col :span="8">
+                        <el-form-item label="欠款金额">
+                            <el-input v-model="queryForm.waitAmount" disabled style="width: 220px;"></el-input>
+                        </el-form-item>
+                    </el-col>   <el-col :span="8">
                         <el-form-item label="备注">
                             <el-input v-model="queryForm.remark" placeholder="请输入备注" style="width: 220px;"></el-input>
                         </el-form-item>
@@ -408,6 +412,9 @@ export default {
         },
         // 切换类型
         changeTypeEnum(index) {
+            let filterd=  this.purveyorList.filter(ele=>ele.id == index)
+            this.queryForm.waitAmount = filterd[0].waitAmount
+
             this.inTabs.forEach((i) => {
                 if (i.value == this.inTabValue) {
                     this.queryForm.type = i.type
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index 9facbeb..4a6bdbe 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -83,6 +83,11 @@
                     </el-col>
                 </el-row>
                 <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="欠款金额">
+                            <el-input v-model="queryForm.waitAmount" disabled style="width: 220px;"></el-input>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="8">
                         <el-form-item label="备注">
                             <el-input v-model="queryForm.remark" placeholder="请输入备注" style="width: 220px;"></el-input>
@@ -122,9 +127,11 @@
                 </el-table-column>
                 <el-table-column label="单位">
                     <template v-slot="scope">
-                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit" :placeholder="scope.row.conUnit">
+                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit"
+                            :placeholder="scope.row.conUnit">
                             <el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
-                            <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo" v-if="scope.row.conUnitTwo"> </el-option>
+                            <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo"
+                                v-if="scope.row.conUnitTwo"> </el-option>
                         </el-select>
                         <div class="tips"> &nbsp;</div>
                     </template>
@@ -141,7 +148,7 @@
                     <template v-slot="scope">
                         <!-- <el-input-number v-model="scope.row.totalAmount" :min="0"
                             controls-position="right"></el-input-number> -->
-                            <el-input :value="formatDecimal(testform(scope.row))" readonly style="width: 100px;" />
+                        <el-input :value="formatDecimal(testform(scope.row))" readonly style="width: 100px;" />
                     </template>
                 </el-table-column>
                 <!-- <el-table-column label="变动后剩余库存">
@@ -526,6 +533,9 @@ export default {
         },
         // 切换类型
         changeTypeEnum(index) {
+            let filterd=  this.purveyorList.filter(ele=>ele.id == index)
+            this.queryForm.waitAmount = filterd[0].waitAmount
+
             if (this.queryForm.purveyorId) {
                 this.shopTypesActive = 0
             } else {