From ac96e0f3e081bbd1fe56f9c260f054c1287477e9 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 26 Jun 2024 11:11:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     |  4 ++--
 src/api/invoicing.js                 |  3 ++-
 src/components/shopList/index.vue    | 15 ++++++++++++++-
 src/views/invoicing/operation_in.vue |  8 +++++---
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index 7029818..363647d 100644
--- a/.env.development
+++ b/.env.development
@@ -3,9 +3,9 @@ ENV = 'development'
 # 接口地址
 # VUE_APP_BASE_API  = 'http://192.168.2.17:8000'
 # VUE_APP_BASE_API  = 'http://192.168.2.42:8000'
-# VUE_APP_BASE_API  = 'http://192.168.2.133:8000'
+VUE_APP_BASE_API  = 'http://192.168.2.147:8000'
 # VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
-VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 # VUE_APP_BASE_API  = 'http://192.168.2.96:8000'
 VUE_APP_WS_API = 'ws://192.168.2.128:8000'
 
diff --git a/src/api/invoicing.js b/src/api/invoicing.js
index 58b107b..85d75e4 100644
--- a/src/api/invoicing.js
+++ b/src/api/invoicing.js
@@ -54,11 +54,12 @@ export function tbProductStockDetailSum(params) {
  */
 export function tbShopPurveyorGet(params) {
   return request({
-    url: `/api/tbShopPurveyor`,
+    url: `/api/tbProduct/admin`,
     method: "get",
     params
   });
 }
+
 // 供应商列表1
 export function tbShopPurveyorGets(params) {
   return request({
diff --git a/src/components/shopList/index.vue b/src/components/shopList/index.vue
index 232270e..e24f0ad 100644
--- a/src/components/shopList/index.vue
+++ b/src/components/shopList/index.vue
@@ -30,6 +30,19 @@
                         </div>
                     </template>
                 </el-table-column>
+                <el-table-column label="规格">
+                    <template v-slot="scope">
+                        {{ scope.row.typeEnum }}
+                    </template>
+                </el-table-column> <el-table-column label="是否售罄">
+                    <template v-slot="scope">
+                        {{ scope.row.isPauseSale == 1?'是':'否' }}
+                    </template>
+                </el-table-column> <el-table-column label="是否分销">
+                    <template v-slot="scope">
+                        {{ scope.row.isDistribute == 1?'是':'否' }}
+                    </template>
+                </el-table-column>
                 <el-table-column label="售价">
                     <template v-slot="scope">
                         ￥{{ scope.row.lowPrice }}
@@ -40,7 +53,7 @@
                         {{ scope.row.realSalesNumber }}/{{ scope.row.stockNumber }}
                     </template>
                 </el-table-column>
-                <el-table-column label="分类" prop="categoryName"></el-table-column>
+                <el-table-column label="分类名称" prop="categoryName"></el-table-column>
             </el-table>
         </div>
         <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 5f1f9af..206a408 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -89,8 +89,8 @@
                 </el-table-column>
                 <el-table-column label="进价">
                     <template v-slot="scope">
-                        <!-- <el-input-number v-model="scope.row.guidePrice" :min="0" controls-position="right"
-                            @change="e => scope.row.totalAmount = e * scope.row.number"></el-input-number> -->
+                        <el-input-number v-model="scope.row.guidePrice" :min="0" controls-position="right"
+                            @change="e => { scope.row.costPrice = e }"></el-input-number>
                         <div class="tips">成本价￥{{ scope.row.costPrice }}/{{ scope.row.unitName }}</div>
                     </template>
                 </el-table-column>
@@ -178,7 +178,7 @@ export default {
                 purveyorId: [
                     {
                         required: true,
-                        message: ' ',
+                        message: '请选择供应商',
                         trigger: 'change'
                     }
                 ],
@@ -202,6 +202,7 @@ export default {
         this.tbShopPurveyorGet()
     },
     methods: {
+      
         // 提交
         submitHandle() {
             this.$refs.queryForm.validate(async valid => {
@@ -209,6 +210,7 @@ export default {
                     try {
                         this.queryFormLoading = true
                         this.queryForm.list = this.tableData.list
+                        console.log(this.queryForm,'调试costPrice')
                         await tbProductStockOperateOutAndOn(this.queryForm)
                         this.queryFormLoading = false
                         this.showResult = true