EricGEGE commited on
Commit
098d736
·
verified ·
1 Parent(s): 544bb85

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +13 -14
app.py CHANGED
@@ -59,9 +59,7 @@ init_sheets()
59
  # Approval process control
60
  def get_next_approval_status(current_status):
61
  try:
62
- if current_status == '待单证审批':
63
- return '待采购经理/总经理审批'
64
- elif current_status == '待采购经理/总经理审批':
65
  return '待财务审批'
66
  elif current_status == '待财务审批':
67
  return '已批准'
@@ -84,8 +82,7 @@ def approve_order(order_id, approver_role):
84
 
85
  current_status = order_records[order_index]['审批状态']
86
 
87
- if (current_status == '待单证审批' and approver_role != '单证') or \
88
- (current_status == '待采购经理/总经理审批' and approver_role not in ['采购经理', '总经理']) or \
89
  (current_status == '待财务审批' and approver_role != '财务') or \
90
  (current_status == '待出纳审批' and approver_role != '出纳'):
91
  return f'只有{current_status}角色可以批准当前订单'
@@ -131,7 +128,7 @@ def submit_order1(
131
  global profit
132
  login(username)
133
 
134
- if session_state['role'] not in ['采购', '采购经理']:
135
  return "只有采购角色可以提交订单"
136
 
137
  orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
@@ -142,8 +139,8 @@ def submit_order1(
142
  prefix = 'SHEN00000'
143
  elif session_state['username'] == 'cevcaigou888':
144
  prefix = 'NIU00000'
145
- elif session_state['username'] == 'cevcaigou005':
146
- prefix = 'HAN00000'
147
 
148
  all_records = orders.get_all_records()
149
  existing_records = [record for record in all_records if record['采购编号'].startswith(prefix)]
@@ -160,7 +157,7 @@ def submit_order1(
160
  付款抬头, existing_record['合同号'], 运编号, order_name, 车辆信息, 销售合同价, 采购价,
161
  费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
162
  existing_record['业务员'], existing_record['客户名称'], existing_record['客户国家'], 在途状态, 开票类型,
163
- 收款状态, '待单证审批', 退款说明, 备注,
164
  datetime.now().strftime('%Y-%m-%d'), profit
165
  ]
166
  orders.append_row(new_order)
@@ -183,7 +180,7 @@ def submit_order2(
183
  global profit
184
  login(username)
185
 
186
- if session_state['role'] not in ['采购', '采购经理']:
187
  return "只有采购角色可以提交订单"
188
 
189
  orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
@@ -194,8 +191,10 @@ def submit_order2(
194
  prefix = 'SHEN00000'
195
  elif session_state['username'] == 'cevcaigou888':
196
  prefix = 'NIU00000'
197
- elif session_state['username'] == 'cevcaigou005':
198
- prefix = 'HAN00000'
 
 
199
 
200
  all_records = orders.get_all_records()
201
  existing_records = [record for record in all_records if record['采购编号'].startswith(prefix)]
@@ -208,7 +207,7 @@ def submit_order2(
208
  付款抬头, 合同号, 运编号, order_name, 车辆信息, 销售合同价, 采购价,
209
  费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
210
  业务员, 客户名称, 客户国家, 在途状态, 开票类型,
211
- 收款状态, '待单证审批', 退款说明, 备注,
212
  datetime.now().strftime('%Y-%m-%d'), profit
213
  ]
214
  orders.append_row(new_order)
@@ -283,7 +282,7 @@ def approve_order_interface(username, order_id):
283
  try:
284
  login(username)
285
 
286
- allowed_roles = ['单证', '财务', '总经理', '采购经理', '出纳'] # Added '出纳' to allowed roles
287
 
288
  if session_state['role'] not in allowed_roles:
289
  return "您没有批准订单的权限"
 
59
  # Approval process control
60
  def get_next_approval_status(current_status):
61
  try:
62
+ if current_status == '待采购经理/总经理审批':
 
 
63
  return '待财务审批'
64
  elif current_status == '待财务审批':
65
  return '已批准'
 
82
 
83
  current_status = order_records[order_index]['审批状态']
84
 
85
+ if (current_status == '待采购经理/总经理审批' and approver_role not in ['采购经理', '总经理']) or \
 
86
  (current_status == '待财务审批' and approver_role != '财务') or \
87
  (current_status == '待出纳审批' and approver_role != '出纳'):
88
  return f'只有{current_status}角色可以批准当前订单'
 
128
  global profit
129
  login(username)
130
 
131
+ if session_state['role'] not in ['采购', '采购经理', '单证']:
132
  return "只有采购角色可以提交订单"
133
 
134
  orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
 
139
  prefix = 'SHEN00000'
140
  elif session_state['username'] == 'cevcaigou888':
141
  prefix = 'NIU00000'
142
+ elif session_state['username'] == 'cevdanzheng789':
143
+ prefix = 'CHEN00000'
144
 
145
  all_records = orders.get_all_records()
146
  existing_records = [record for record in all_records if record['采购编号'].startswith(prefix)]
 
157
  付款抬头, existing_record['合同号'], 运编号, order_name, 车辆信息, 销售合同价, 采购价,
158
  费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
159
  existing_record['业务员'], existing_record['客户名称'], existing_record['客户国家'], 在途状态, 开票类型,
160
+ 收款状态, '待采购经理/总经理审批', 退款说明, 备注,
161
  datetime.now().strftime('%Y-%m-%d'), profit
162
  ]
163
  orders.append_row(new_order)
 
180
  global profit
181
  login(username)
182
 
183
+ if session_state['role'] not in ['采购', '采购经理', '单证']:
184
  return "只有采购角色可以提交订单"
185
 
186
  orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
 
191
  prefix = 'SHEN00000'
192
  elif session_state['username'] == 'cevcaigou888':
193
  prefix = 'NIU00000'
194
+ elif session_state['username'] == 'cevdanzheng789':
195
+ prefix = 'CHEN00000'
196
+
197
+
198
 
199
  all_records = orders.get_all_records()
200
  existing_records = [record for record in all_records if record['采购编号'].startswith(prefix)]
 
207
  付款抬头, 合同号, 运编号, order_name, 车辆信息, 销售合同价, 采购价,
208
  费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
209
  业务员, 客户名称, 客户国家, 在途状态, 开票类型,
210
+ 收款状态, '待采购经理/总经理审批', 退款说明, 备注,
211
  datetime.now().strftime('%Y-%m-%d'), profit
212
  ]
213
  orders.append_row(new_order)
 
282
  try:
283
  login(username)
284
 
285
+ allowed_roles = ['财务', '总经理', '采购经理', '出纳'] # Removed '单证' from allowed roles
286
 
287
  if session_state['role'] not in allowed_roles:
288
  return "您没有批准订单的权限"