From 802d79f7e35251f2f0eea3774a9157715e01526d Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 22 五月 2025 14:50:36 +0800
Subject: [PATCH] 采购管理=》来票登记、来票账单 前端联调

---
 src/views/procurementManagement/procurementInvoiceLedger/index.vue |   58 +++++++++++++++-------------
 src/main.js                                                        |    2 
 src/views/procurementManagement/invoiceEntry/index.vue             |   42 ++++++++++++++-------
 vite.config.js                                                     |    2 
 4 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/src/main.js b/src/main.js
index aae294c..da9e2b8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@
 app.config.globalProperties.addDateRange = addDateRange
 app.config.globalProperties.selectDictLabel = selectDictLabel
 app.config.globalProperties.selectDictLabels = selectDictLabels
-app.config.globalProperties.javaApi = 'http://192.168.1.36:8080'
+app.config.globalProperties.javaApi = 'http://192.168.1.35:8080'
 app.config.globalProperties.HaveJson = (val) => {
   return JSON.parse(JSON.stringify(val));
 };
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 937dd54..070b7ce 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -43,11 +43,11 @@
         <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip />
         <el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip />
         <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip :formatter="formattedNumber" />
-        <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
+        <!-- <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
           <template #default="scope">
             <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
         :page="page.current" :limit="page.size" @pagination="paginationChange" />
@@ -99,8 +99,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="寮�绁ㄦ棩鏈燂細" prop="issueDate">
-              <el-date-picker disabled style="width: 100%" v-model="form.issueDate" value-format="YYYY-MM-DD"
-                format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable />
+                <el-date-picker disabled style="width: 100%" v-model="form.issueDate" type="date" clearable />
             </el-form-item>
           </el-col>
         </el-row>
@@ -184,6 +183,7 @@
     purchaseContractNumber: '',
   },
   form: {
+    issueDate:"",// 寮�绁ㄦ棩鏈�
     purchaseLedgerId: '',
     purchaseLedgerNo: '',
     issUerId: '', // 寮�绁ㄤ汉id
@@ -229,7 +229,7 @@
 };
 // 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = (selection) => {
-  selectedRows.value = selection
+  selectedRows.value = selection.filter(item => item.purchaseContractNumber !== undefined);
 }
 const productSelected = (selectedRows) => {
   productSelectedRows.value = selectedRows
@@ -285,6 +285,7 @@
   fileList.value = []
   form.value.issUerId = userStore.id
   form.value.issUer = userStore.name
+  form.value.issueDate = getNowFormatDate()
   userListNoPage().then(res => {
     userList.value = res.data
   })
@@ -292,11 +293,12 @@
   if (type === 'add' && row && row.id) {
     form.value.purchaseLedgerId = row.id
     getPurchaseNoById({ id: row.id }).then(res => {
-      purchaseLedgerList.value = res,
-        form.value.purchaseLedgerNo = res.purchaseContractNumber;
-        form.value.invoiceAmount = res.invoiceAmount;
-        form.value.invoiceNumber = res.invoiceNumber;
-      setInfo(res.id)
+      let result = res.data
+      purchaseLedgerList.value = result,
+        form.value.purchaseLedgerNo = result.purchaseContractNumber;
+        form.value.invoiceAmount = result.invoiceAmount;
+        form.value.invoiceNumber = result.invoiceNumber;
+      setInfo(result.id)
     })
   } else {
     getProduct().then(res => {
@@ -320,10 +322,11 @@
 // 閫夋嫨閲囪喘鍚堝悓鍙疯祴鍊�
 const setInfo = (value) => {
   getInfo({ id: value }).then(res => {
-    form.value.salesContractNo = res.salesContractNo
-    form.value.projectName = res.projectName
-    productData.value = res.productData
-    form.value.supplierName = res.supplierName
+    let result = res.data
+    form.value.salesContractNo = result.salesContractNo
+    form.value.projectName = result.projectName
+    productData.value = result.productData
+    form.value.supplierName = result.supplierName
   })
 }
 // 鎻愪氦琛ㄥ崟
@@ -408,6 +411,17 @@
   // 璁$畻鏈紑绁ㄩ噾棰�
   row.futureTicketsAmount = row.futureTickets * row.taxInclusiveUnitPrice
 }
+
+// 鑾峰彇褰撳墠鏃ユ湡鍑芥暟
+function getNowFormatDate() {
+  let date = new Date(),
+    year = date.getFullYear(), //鑾峰彇瀹屾暣鐨勫勾浠�(4浣�)
+    month = date.getMonth() + 1, //鑾峰彇褰撳墠鏈堜唤(0-11,0浠h〃1鏈�)
+    strDate = date.getDate() // 鑾峰彇褰撳墠鏃�(1-31)
+  if (month < 10) month = `0${month}` // 濡傛灉鏈堜唤鏄釜浣嶆暟锛屽湪鍓嶉潰琛�0
+  if (strDate < 10) strDate = `0${strDate}` // 濡傛灉鏃ユ槸涓綅鏁帮紝鍦ㄥ墠闈㈣ˉ0
+  return `${year}-${month}-${strDate}`
+}
 getList()
 </script>
 
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index 4b47419..d73b2b3 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -33,9 +33,9 @@
         <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
       </div>
       <div>
-        <el-button type="primary" @click="openForm('add')">鏂板鍙拌处</el-button>
+        <!-- <el-button type="primary" @click="openForm('add')">鏂板鍙拌处</el-button> -->
         <el-button @click="handleOut">瀵煎嚭</el-button>
-        <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+        <!-- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button> -->
       </div>
     </div>
     <div class="table_list">
@@ -47,7 +47,7 @@
                 height="calc(100vh - 18.5em)">
         <el-table-column align="center" type="selection" width="55" />
         <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-        <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNo" show-overflow-tooltip/>
+        <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" show-overflow-tooltip/>
         <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/>
         <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip/>
         <el-table-column label="鍙戠エ鍙�" prop="invoiceNumber" show-overflow-tooltip/>
@@ -55,27 +55,32 @@
         <el-table-column label="绋庣巼(%)" prop="taxRate" show-overflow-tooltip/>
         <el-table-column label="寮�绁ㄤ汉" prop="issUer" show-overflow-tooltip/>
         <el-table-column label="寮�绁ㄦ棩鏈�" prop="issueDate" show-overflow-tooltip/>
-        <el-table-column label="鍙戠エ" prop="fileName" show-overflow-tooltip>
+        <!-- <el-table-column label="鍙戠エ" prop="fileName" show-overflow-tooltip>
           <template #default="scope">
             <span v-if="scope.row.fileName">{{ scope.row.fileName }}</span>
             <el-button v-else link type="primary" @click="handleDownload(scope.row)">涓婁紶</el-button>
           </template>
-        </el-table-column>
-        <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
+        </el-table-column> -->
+        <!-- <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
           <template #default="scope">
             <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
+          </template>
+        </el-table-column> -->
+        <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
+          <template #default="scope">
+          <el-button link type="primary" size="small" @click="openForm('check', scope.row);">鏌ョ湅</el-button>
           </template>
         </el-table-column>
       </el-table>
       <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
                   :limit="page.size" @pagination="paginationChange" />
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍙戠エ鍙烽〉闈�' : '缂栬緫鍙戠エ鍙烽〉闈�'" width="70%" @close="closeDia">
+    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍙戠エ鍙烽〉闈�' : '鏌ョ湅鍙戠エ鍙烽〉闈�'" width="70%" @close="closeDia">
       <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="閲囪喘鍚堝悓鍙凤細" prop="purchaseLedgerId">
-              <el-select v-model="form.purchaseLedgerId" placeholder="璇烽�夋嫨" clearable @change="setInfo" :disabled="operationType === 'edit'">
+              <el-select v-model="form.purchaseLedgerId" placeholder="璇烽�夋嫨" clearable @change="setInfo">
                 <el-option v-for="item in purchaseLedgerList" :key="item.id" :label="item.purchaseContractNumber" :value="item.id"/>
               </el-select>
             </el-form-item>
@@ -94,19 +99,19 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="鍙戠エ鍙凤細" prop="invoiceNumber">
-              <el-input v-model="form.invoiceNumber" placeholder="璇疯緭鍏�" clearable/>
+              <el-input v-model="form.invoiceNumber" placeholder="璇疯緭鍏�" :disabled="operationType === 'check'" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="鍙戠エ閲戦(鍏�)锛�" prop="invoiceAmount">
-              <el-input type="number" :step="0.01" v-model="form.invoiceAmount" placeholder="璇疯緭鍏�" clearable/>
+              <el-input type="number" :step="0.01" v-model="form.invoiceAmount" placeholder="璇疯緭鍏�" :disabled="operationType === 'check'" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="绋庣巼锛�" prop="taxRate">
-              <el-input type="number" :step="0.01" v-model="form.taxRate" placeholder="璇疯緭鍏�" clearable/>
+              <el-input type="number" :step="0.01" v-model="form.taxRate" placeholder="璇疯緭鍏�" :disabled="operationType === 'check'" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -131,7 +136,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="30">
+        <!-- <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="闄勪欢鏉愭枡锛�" prop="remark">
               <el-upload
@@ -158,12 +163,12 @@
               </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">纭</el-button>
-          <el-button @click="closeDia">鍙栨秷</el-button>
+          <!-- <el-button type="primary" @click="submitForm">纭</el-button> -->
+          <!-- <el-button @click="closeDia">鍙栨秷</el-button> -->
         </div>
       </template>
     </el-dialog>
@@ -187,8 +192,8 @@
                 :on-remove="handleRemove"
             >
               <el-button type="primary">涓婁紶</el-button>
-              <template #tip>
                 <!--                  鏂囦欢鏍煎紡鏀寔 doc锛宒ocx锛寈ls锛寈lsx锛宲pt锛宲ptx锛宲df锛宼xt锛寈ml锛宩pg锛宩peg锛宲ng锛実if锛宐mp锛宺ar锛寊ip锛�7z-->
+              <template #tip>
                 <div class="el-upload__tip">
                   鏂囦欢鏍煎紡鏀寔 pdf
                 </div>
@@ -262,16 +267,16 @@
     customerName:'',
     fileList:[]
   },
-  rules: {
-    purchaseLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    customerId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    invoiceNumber: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    invoiceAmount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    taxRate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    issUer: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    issueDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    customerName: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-  }
+  // rules: {
+  //   purchaseLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+  //   customerId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+  //   invoiceNumber: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+  //   invoiceAmount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+  //   taxRate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+  //   issUer: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+  //   issueDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+  //   customerName: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+  // }
 })
 const { searchForm, form, rules } = toRefs(data)
 const currentId = ref('')
@@ -383,7 +388,6 @@
 }
 // 绉婚櫎鏂囦欢
 function handleRemove (file) {
-  console.log('handleRemove', file.id)
   if (operationType.value === 'edit') {
     let ids = []
     ids.push(file.id)
diff --git a/vite.config.js b/vite.config.js
index 13d1fcb..70b85c8 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,7 +2,7 @@
 import path from 'path'
 import createVitePlugins from './vite/plugins'
 
-const baseUrl = 'http://localhost:8080' // 鍚庣鎺ュ彛
+const baseUrl = 'http://192.168.1.35:8080' // 鍚庣鎺ュ彛
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {

--
Gitblit v1.9.3