فهرست منبع

工作台bug处理

hurx 9 ساعت پیش
والد
کامیت
f6ba45ba09

+ 2 - 2
src/api/home/index-enterprise.ts

@@ -31,7 +31,7 @@ export function getCustomerProductPage(query: any) {
 
 export function customerMessageList(query: any) {
   return request({
-    url: '/customer/customerMessage/list',
+    url: '/customer/pcCustomerMessage/list',
     method: 'get',
     params: query
   });
@@ -41,7 +41,7 @@ export function customerMessageList(query: any) {
 
 export const customerMessageDetail = (id: any) => {
   return request({
-    url: '/customer/customerMessage/' + id,
+    url: '/customer/pcCustomerMessage/' + id,
     method: 'get'
   });
 };

+ 1 - 1
src/router/index.ts

@@ -346,7 +346,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       },
       {
         path: 'enterprise/changePerson',
-        name: 'PurchaseHabit',
+        name: 'ChangePerson',
         component: () => import('@/views/enterprise/changePerson/index.vue'),
         meta: { title: '更换负责人', hidden: true, workbench: true }
       },

+ 0 - 1
src/views/cost/quotaControl/apply.vue

@@ -111,7 +111,6 @@ const handleSave = async () => {
   } catch (error) {
     ElMessage.error('保存失败');
   }
-  router.back();
 };
 </script>
 

+ 17 - 7
src/views/cost/quotaControl/index.vue

@@ -12,22 +12,22 @@
           <el-icon><CreditCard /></el-icon>
         </div>
         <div class="card-info">
-          <div class="card-label">当前额度 ></div>
-          <div class="card-value">32</div>
+          <div class="card-label">信用额度</div>
+          <div class="card-value">{{ (parseInt(customerSalesInfoVo?.creditAmount) || 0).toFixed(2) }}</div>
         </div>
       </div>
       <div class="quota-card">
         <div class="card-info">
-          <div class="card-label">剩余可用额度 ></div>
-          <div class="card-value">8,831.00</div>
+          <div class="card-label">剩余可用额度</div>
+          <div class="card-value">{{ (parseInt(customerSalesInfoVo?.remainingQuota) || 0).toFixed(2) }}</div>
         </div>
       </div>
-      <div class="quota-card">
+      <!-- <div class="quota-card">
         <div class="card-info">
-          <div class="card-label">已使用额度 ></div>
+          <div class="card-label">已使用额度 </div>
           <div class="card-value">8,831.00</div>
         </div>
-      </div>
+      </div> -->
     </div>
 
     <!-- 信用额度申请记录 -->
@@ -59,11 +59,14 @@ import { useRouter } from 'vue-router';
 import { CreditCard } from '@element-plus/icons-vue';
 import { PageTitle } from '@/components';
 import { getCreditApplyList } from '@/api/pc/cost/creditApply';
+import { getEnterpriseInfo } from '@/api/pc/enterprise';
+import { any } from 'vue-types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { purchase_item } = toRefs<any>(proxy?.useDict('purchase_item'));
 const router = useRouter();
 
 const recordList = ref([]);
+const customerSalesInfoVo = ref({} as any);
 
 const loadCreditApply = async () => {
   try {
@@ -94,6 +97,13 @@ const handleApplyQuota = () => {
 };
 
 onMounted(() => {
+  getEnterpriseInfo().then((res) => {
+    if (res.code == 200) {
+      if (res.data && res.data.customerSalesInfoVo) {
+        customerSalesInfoVo.value = res.data.customerSalesInfoVo;
+      }
+    }
+  });
   loadCreditApply();
 });
 </script>

+ 11 - 5
src/views/enterprise/invoiceManage/index.vue

@@ -18,8 +18,8 @@
     <!-- 表格 -->
     <el-table :data="tableData" border style="width: 100%" :resizable="false">
       <el-table-column prop="bankName" label="开户银行" width="140" show-overflow-tooltip :resizable="false" />
-      <el-table-column prop="bankAccount" label="开户账户" width="140" :resizable="false" />
-      <el-table-column prop="taxId" label="纳税人识别号" width="160" :resizable="false" />
+      <el-table-column prop="bankAccount" label="开户账户" width="180" :resizable="false" />
+      <el-table-column prop="taxId" label="纳税人识别号" width="180" :resizable="false" />
       <el-table-column prop="address" label="地址" min-width="140" show-overflow-tooltip :resizable="false" />
       <el-table-column prop="phone" label="电话" width="120" :resizable="false" />
       <el-table-column label="操作" width="120" fixed="right" :resizable="false">
@@ -70,7 +70,7 @@
 
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue';
-import { Phone, Search } from '@element-plus/icons-vue';
+import { Search } from '@element-plus/icons-vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { getEnterpriseInfo } from '@/api/pc/enterprise';
 import { getInvoiceList, addInvoice, updateInvoice, deleteInvoice } from '@/api/pc/enterprise';
@@ -82,6 +82,7 @@ const formRef = ref();
 const editingId = ref<number | null>(null);
 const total = ref(0);
 const invoiceTopic = ref('');
+const taxNo = ref('');
 
 const queryParams = reactive({ pageNum: 1, pageSize: 10, keyword: '', searchType: 'accountName' });
 const form = reactive({ invoiceTitle: '', taxNo: '', bankName: '', bankAccount: '', address: '', phone: '', bankId: null, bankCode: '' });
@@ -90,7 +91,10 @@ const rules = {
   taxNo: [{ required: true, message: '请输入纳税人识别号', trigger: 'blur' }],
   bankName: [{ required: true, message: '请输入开户银行', trigger: 'blur' }],
   bankAccount: [{ required: true, message: '请输入开户账户', trigger: 'blur' }],
-  phone: [{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }]
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
+  ]
 };
 
 const tableData = ref([]);
@@ -128,6 +132,7 @@ const loadEnterpriseInfo = async () => {
     if (res.code === 200 && res.data) {
       const data = res.data;
       invoiceTopic.value = data.invoiceTop;
+      taxNo.value = data.socialCreditCode;
     }
   } catch (error) {
     console.error('加载企业信息失败:', error);
@@ -157,12 +162,13 @@ const handleAdd = () => {
   resetForm();
   dialogTitle.value = '新增开票信息';
   form.invoiceTitle = invoiceTopic.value || '';
+  form.taxNo = taxNo.value || '';
   dialogVisible.value = true;
 };
 const handleEdit = (row: any) => {
   editingId.value = row.id;
   form.invoiceTitle = invoiceTopic.value || '';
-  form.taxNo = row.taxId;
+  form.taxNo = row.taxNo;
   form.bankName = row.bankName;
   form.bankAccount = row.bankAccount;
   form.address = row.address;

+ 18 - 4
src/views/enterprise/messageNotice/index.vue

@@ -50,6 +50,12 @@
       <el-table-column prop="title" label="标题" width="120" align="center" />
       <el-table-column prop="content" label="内容" />
       <el-table-column prop="createTime" label="创建时间" width="160" align="center" />
+      <el-table-column prop="status" label="状态" width="160" align="center">
+        <template #default="{ row }">
+          <span v-if="row.status == '0'">生效</span>
+          <span v-else>停用</span>
+        </template>
+      </el-table-column>
 
       <el-table-column label="操作" width="120" align="center" fixed="right">
         <template #default="{ row }">
@@ -82,6 +88,12 @@
         <el-form-item label="内容" prop="content">
           <el-input v-model="form.content" type="textarea" :rows="6" :maxlength="300" show-word-limit placeholder="请输入内容" />
         </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio label="0">生效</el-radio>
+            <el-radio label="1">停用</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <template #footer>
         <el-button @click="dialogVisible = false">取消</el-button>
@@ -103,7 +115,7 @@ const dialogVisible = ref(false);
 const dialogTitle = ref('新增消息通知');
 const formRef = ref();
 const editingId = ref<number | null>(null);
-const form = reactive({ title: '', content: '' });
+const form = reactive({ title: '', content: '', status: '0' });
 
 const rules = {
   title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
@@ -137,15 +149,16 @@ const loadData = () => {
 };
 const handleAdd = () => {
   resetForm();
-  dialogTitle.value = '新增收货地址';
+  dialogTitle.value = '新增消息通知';
   dialogVisible.value = true;
 };
 const handleEdit = (item: any) => {
   editingId.value = item.id;
   form.title = item.title;
   form.content = item.content;
+  form.status = item.status;
 
-  dialogTitle.value = '编辑收货地址';
+  dialogTitle.value = '编辑消息通知';
   dialogVisible.value = true;
 };
 const handleSave = async () => {
@@ -154,7 +167,8 @@ const handleSave = async () => {
   try {
     const data: any = {
       title: form.title,
-      content: form.content
+      content: form.content,
+      status: form.status
     };
 
     if (editingId.value) {

+ 1 - 1
src/views/home/pccomponents/pages/headData.vue

@@ -300,7 +300,7 @@ getProductCategoryTree({ platform: componentData.headType ? componentData.headTy
 const getDataList = () => {
   realList.value = [];
   // 默认
-  customerMessageList({ pageSize: 20 }).then((res) => {
+  customerMessageList({ status: '0', pageSize: 20 }).then((res) => {
     if (res.code == 200) {
       realList.value = res.rows;
     }

+ 1 - 1
src/views/order/orderAudit/index.vue

@@ -255,7 +255,7 @@ const loadOrderList = async () => {
     } else if (activeStatusTab.value === 'rejected') {
       params.checkStatus = '2';
     }
-
+    params.isNeedCheck = '0';
     // 添加筛选条件
     if (queryParams.keyword) params.orderNo = queryParams.keyword;
     if (queryParams.department) params.createDept = queryParams.department;

+ 4 - 0
src/views/order/orderManage/detail.vue

@@ -280,7 +280,11 @@ const loadOrderDetail = async () => {
       orderTimeInfo.createTime = order.createTime || '';
       orderTimeInfo.updateTime = order.updateTime || '';
       if (order.orderStatus == 5) {
+        // 1. 设置当前步骤为最后一个
         currentStep.value = progressSteps.value.length - 1;
+
+        // 2. 修改最后一个元素的时间
+        progressSteps.value[progressSteps.value.length - 1].time = formatTime(order.updateTime);
       }
       // 获取商品信息
       const productsRes = await getOrderProducts([orderId.value]);

+ 6 - 7
src/views/organization/roleManage/index.vue

@@ -17,12 +17,11 @@
       </el-table-column>
       <el-table-column prop="createTime" label="创建时间" width="180" align="center" />
       <el-table-column prop="remark" label="备注" min-width="150" align="center" show-overflow-tooltip />
-      <el-table-column label="操作" width="150" align="center" fixed="right">
+      <!-- <el-table-column label="操作" width="150" align="center" fixed="right">
         <template #default="{ row }">
-          <!-- <el-button type="primary" link size="small" @click="handleEdit(row)">编辑</el-button> -->
           <el-button disabled type="danger" link size="small" @click="handleDelete(row)">删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <el-pagination
@@ -106,10 +105,10 @@ const loadRoleList = async () => {
     //   roleList.value = res.data;
     // }
     roleList.value = [
-      { roleId: 1, roleName: '管理角色', roleSort: 1, status: '0', createTime: '2026-01-27 09:36:27' },
-      { roleId: 2, roleName: '采购角色', roleSort: 2, status: '0', createTime: '2026-01-27 09:36:38' },
-      { roleId: 3, roleName: '查询角色', roleSort: 3, status: '0', createTime: '2026-01-27 09:37:33' },
-      { roleId: 4, roleName: '审核角色', roleSort: 4, status: '0', createTime: '2026-01-27 09:37:50' }
+      { roleId: 1, roleName: '管理角色', roleSort: 1, status: '0', remark: '管理角色', createTime: '2026-01-27 09:36:27' },
+      { roleId: 2, roleName: '采购角色', roleSort: 2, status: '0', remark: '采购角色', createTime: '2026-01-27 09:36:38' },
+      { roleId: 3, roleName: '查询角色', roleSort: 3, status: '0', remark: '查询角色', createTime: '2026-01-27 09:37:33' },
+      { roleId: 4, roleName: '审核角色', roleSort: 4, status: '0', remark: '审核角色', createTime: '2026-01-27 09:37:50' }
     ];
   } catch (error) {
     console.error('获取角色列表失败:', error);

+ 4 - 1
src/views/organization/staffManage/index.vue

@@ -133,7 +133,10 @@ const formData = reactive({
 
 const formRules = {
   contactName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-  phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
+  ],
   deptId: [{ required: true, message: '请选择部门', trigger: 'change' }]
 };