hurx 2 дней назад
Родитель
Сommit
15607c893e

+ 10 - 2
src/api/customer/supplierInfo/index.ts

@@ -62,6 +62,16 @@ export const delInfo = (id: string | number | Array<string | number>) => {
   });
 };
 
+/**
+ * 根据名称模糊查询供应商信息
+ * @param supplierName
+ */
+export const getListByPartnerName = (supplierName: string): AxiosPromise<InfoVO[]> => {
+  return request({
+    url: '/customer/info/selectBySupplierName/' + supplierName,
+    method: 'get'
+  });
+};
 
 /**
  * 获取供应商类型列表
@@ -286,8 +296,6 @@ export const getSupplierTypeList = (params?: any) => {
     url: '/system/type/list',
     method: 'get',
     params: {
-
-
       dataSource: 'youyi',
       ...params
     }

+ 3 - 3
src/views/bill/statementInvoice/index.vue

@@ -275,10 +275,10 @@ const handleSend = async (row?: StatementInvoiceVO) => {
   const _no = row?.statementInvoiceNo;
   const _ids = row?.id || ids.value;
   const oldValue = row.invoiceStatus; // 保存旧值
-  await proxy?.$modal.confirm('是否发送当前发票编号【' + _no + '】吗?').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认当前发票编号【' + _no + '】吗?').finally(() => (loading.value = false));
   //todo 发送
   try {
-    await changeStatus(row.id, '1'); // 传新值 1 待开票
+    await changeStatus(row.id, '2'); // 传新值 1 待开票
   } catch (e) {
     // 恢复旧值
     row.invoiceStatus = oldValue;
@@ -319,7 +319,7 @@ const buttonConfigMap: Record<number, ActionButton[]> = {
   [InvoiceStatus.DRAFT]: [
     { action: 'detail', label: '查看', handler: handleDetail, permission: 'bill:statementInvoice:edit' },
     { action: 'edit', label: '编辑', handler: handleUpdate, permission: 'bill:statementInvoice:edit' },
-    { action: 'send', label: '发送开票信息', handler: handleSend, permission: 'bill:statementInvoice:edit' },
+    { action: 'send', label: '确认', handler: handleSend, permission: 'bill:statementInvoice:edit' },
     { action: 'withdraw', label: '撤回', handler: handleWithdraw, permission: 'bill:statementInvoice:edit' },
     { action: 'obsolete', label: '作废', handler: handleObsolete, permission: 'bill:statementInvoice:remove' }
   ],

+ 3 - 3
src/views/order/orderReturn/returnDetail.vue

@@ -31,15 +31,15 @@
         </el-descriptions-item>
 
         <el-descriptions-item label="凭证照片" :span="2">
-          <div v-if="orderDetail.voucherPhoto && orderDetail.voucherPhoto.length > 0">
+          <!-- 确保 split(',') 将字符串转为数组进行遍历 -->
+          <div v-if="orderDetail.voucherPhoto">
             <el-image
-              v-for="(url, index) in orderDetail.voucherPhoto"
+              v-for="(url, index) in orderDetail.voucherPhoto.split(',')"
               :key="index"
               :src="url"
               :preview-src-list="orderDetail.voucherPhoto.split(',')"
               style="width: 80px; height: 80px; margin-right: 8px; object-fit: cover"
               fit="cover"
-              :initial-index="index"
             />
           </div>
           <span v-else>无</span>