shish hai 1 día
pai
achega
a47703a297

+ 0 - 1
ghs/src/components/purchase/PurchaseCommitPanel.vue

@@ -212,7 +212,6 @@
       >
         {{ isLocal ? '确认提交(Ctrl+Enter)' : '下一步(Ctrl+Enter)' }}
       </el-button>
-      <p class="tip">清单改好后直接在此提交</p>
     </div>
   </aside>
 </template>

+ 2 - 2
ghs/src/mock/userInfo.js

@@ -168,8 +168,8 @@ let menu = {
 
 		{id: '1400',parentId: null,name: '采购',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},
 		{id: '1405',parentId: 1400,name: '采购记录',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},
-		{id: '1415',parentId: 1400,name: '采购',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/add',viewPath: 'views/in/add.vue',keepAlive: 1},
-		{id: '1425',parentId: 1400,name: '确认采购',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/confirm',viewPath: 'views/in/confirm.vue',keepAlive: 1},
+		{id: '1425',parentId: 1400,name: '采购',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/confirm',viewPath: 'views/in/confirm.vue',keepAlive: 1},
+		{id: '1415',parentId: 1400,name: '供货商',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/add',viewPath: 'views/in/add.vue',keepAlive: 1},
 		{id: '1430',parentId: 1400,name: '售后记录',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/refund-list',viewPath: 'views/in/refund-list.vue',keepAlive: 1},
 		{id: '1420',parentId: 1400,name: '入库改价',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/change',viewPath: 'views/in/change.vue',keepAlive: 1},
 

+ 1 - 1
ghs/src/views/in/add.vue

@@ -31,7 +31,7 @@
   					<el-button size="small" type="primary">导入Excel</el-button>
 				</el-upload>
 
-				<el-button size="small" type="primary" @click="goCg(scope.row)" style="margin-left:30px;">新增采购</el-button>
+				<el-button size="small" type="primary" @click="goCg(scope.row)" style="margin-left:30px;">采购</el-button>
 			</template>
 
 

+ 1 - 14
ghs/src/views/in/confirm.vue

@@ -23,7 +23,6 @@
         <el-radio-button :label="1">本地</el-radio-button>
       </el-radio-group>
       <el-button type="primary" size="medium" icon="el-icon-plus" @click="openAddGhs">添加供货商</el-button>
-      <el-button size="medium" @click="comeBack">返回</el-button>
     </div>
 
     <el-table
@@ -113,7 +112,7 @@
             {{ Number(location) === 1 ? '本地' : '上游' }}
           </el-tag>
         </div>
-        <div class="pos-customer-name" :title="form.ghsName">供货商:{{ form.ghsName }}</div>
+        <div class="pos-customer-name" :title="form.ghsName">{{ form.ghsName }}</div>
       </div>
     </div>
 
@@ -215,10 +214,6 @@
           <div class="footer-main-row">
             <div class="sum-price">¥ {{ selectAllPrice }}</div>
           </div>
-          <!-- 提交改到右侧确认订单面板;清单仅保留汇总与返回 -->
-          <div class="cart-actions">
-            <el-button size="medium" class="commit-btn" @click="comeBack">返回</el-button>
-          </div>
         </div>
       </aside>
 
@@ -1310,14 +1305,6 @@ export default {
   line-height: 1.1;
 }
 
-.cart-actions {
-  display: flex;
-  align-items: center;
-  .commit-btn {
-    flex: 1;
-  }
-}
-
 .pos-empty {
   padding: 40px 12px;
   text-align: center;