diff --git a/.env.production b/.env.production
index 8c2ed2b..c6152f0 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@ ENV = 'production'
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 # 测试
-VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+# 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.98:8000'
 # 如果接口是 http 形式， wss 需要改为 ws
 VUE_APP_WS_API = 'wss://123.56.110.252
diff --git a/src/views/invoicing/consumable/cons_record.vue b/src/views/invoicing/consumable/cons_record.vue
index d87b2cd..3118a3b 100644
--- a/src/views/invoicing/consumable/cons_record.vue
+++ b/src/views/invoicing/consumable/cons_record.vue
@@ -24,6 +24,7 @@
                 <el-table-column label="现有库存" prop="balance" />
                 <!-- <el-table-column label="业务编码" prop="bizCode" /> -->
                 <el-table-column label="业务说明" prop="bizName" />
+                <el-table-column label="商品名称" prop="productName" />
                 <!-- <el-table-column label="正负号标识" prop="bizType" /> -->
                 <!-- <el-table-column label="耗材id" prop="consId" /> -->
                 <el-table-column label="创建时间" prop="createTime"></el-table-column>
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 6b5c941..10a4e55 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -5,7 +5,7 @@
                 <el-form-item label="入库内容">
                     <div class="shop_type_box">
                         <div class="item" v-for="item in inTabs" :key="item.value"
-                            :class="{ active: inTabValue == item.value }" @click="inTabValue = item.value">
+                            :class="{ active: inTabValue == item.value }" @click="tabChange(item.value)">
                             <div class="s_title">{{ item.label }}</div>
                             <div class="active_dot">
                                 <i class="el-icon-check"></i>
@@ -13,7 +13,7 @@
                         </div>
                     </div>
                 </el-form-item>
-                <el-form-item label="入库类型">
+                <el-form-item label="入库类型" v-if="inTabValue == 'goods'">
                     <div class="shop_type_box">
                         <div class="item" v-for="(item, index) in shopTypes" :key="index"
                             :class="{ active: shopTypesActive == index }" @click="changeTypeEnum(index)">
@@ -24,6 +24,17 @@
                         </div>
                     </div>
                 </el-form-item>
+                <el-form-item label="入库类型" v-else>
+                    <div class="shop_type_box">
+                        <div class="item" v-for="(item, index) in shopTypes2" :key="index"
+                            :class="{ active: shopTypesActive == index }" @click="changeTypeEnum(index)">
+                            <div class="s_title">{{ item.label }}</div>
+                            <div class="active_dot">
+                                <i class="el-icon-check"></i>
+                            </div>
+                        </div>
+                    </div>
+                </el-form-item>
                 <el-row>
                     <el-col :span="8" v-if="shopTypes[shopTypesActive].value == 'purveyor'">
                         <el-form-item label="供应商" prop="purveyorId">
@@ -233,6 +244,12 @@ export default {
                     value: 'purchase'
                 }
             ],
+            shopTypes2: [
+                {
+                    label: '供应商入库',
+                    value: 'purveyor'
+                },
+            ],
             resetForm: '',
             queryFormLoading: false,
             queryForm: {
@@ -276,6 +293,11 @@ export default {
         this.tbShopPurveyorGet()
     },
     methods: {
+        // 切换入库内容
+        tabChange(value) {
+            this.inTabValue = value
+            this.shopTypesActive = 0
+        },
         modifyPrice() {
             let zong = 0
             this.tableData.list.forEach(ele => {
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index 253102d..3be3b4e 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -5,7 +5,7 @@
                 <el-form-item label="出库内容">
                     <div class="shop_type_box">
                         <div class="item" v-for="item in inTabs" :key="item.value"
-                            :class="{ active: inTabValue == item.value }" @click="inTabValue = item.value">
+                            :class="{ active: inTabValue == item.value }" @click="tabChange(item.value)">
                             <div class="s_title">{{ item.label }}</div>
                             <div class="active_dot">
                                 <i class="el-icon-check"></i>
@@ -13,7 +13,7 @@
                         </div>
                     </div>
                 </el-form-item>
-                <el-form-item label="出库类型">
+                <el-form-item label="出库类型" v-if="inTabValue == 'goods'">
                     <div class="shop_type_box">
                         <div class="item" v-for="(item, index) in shopTypes" :key="index"
                             :class="{ active: shopTypesActive == index }" @click="changeTypeEnum(index)">
@@ -24,6 +24,17 @@
                         </div>
                     </div>
                 </el-form-item>
+                <el-form-item label="出库类型" v-else>
+                    <div class="shop_type_box">
+                        <div class="item" v-for="(item, index) in shopTypes2" :key="index"
+                            :class="{ active: shopTypesActive == index }" @click="changeTypeEnum(index)">
+                            <div class="s_title">{{ item.label }}</div>
+                            <div class="active_dot">
+                                <i class="el-icon-check"></i>
+                            </div>
+                        </div>
+                    </div>
+                </el-form-item>
                 <el-row>
                     <el-col :span="8" v-if="shopTypes[shopTypesActive].value == 'reject'">
                         <el-form-item label="供应商" prop="purveyorId">
@@ -230,6 +241,12 @@ export default {
                     value: 'other-out'
                 }
             ],
+            shopTypes2: [
+                {
+                    label: '供应商退货',
+                    value: 'reject'
+                }
+            ],
             resetForm: '',
             queryFormLoading: false,
             queryForm: {
@@ -273,6 +290,11 @@ export default {
         this.tbShopPurveyorGet()
     },
     methods: {
+        // 切换入库内容
+        tabChange(value) {
+            this.inTabValue = value
+            this.shopTypesActive = 0
+        },
         modifyPrice() {
             let zong = 0
             this.tableData.list.forEach(ele => {