开票3

src/views/finance/invoiceAccess/detailsPage.vue

@@ -309,9 +309,9 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              return Math.round(prev + curr * 100) / 100;
+              return (Number(prev) + Number(curr)).toFixed(2);
             } else {
-              return Math.round(prev * 100) / 100;
+              return Number(prev).toFixed(2);
             }
           }, 0);
           sums[index];

src/views/finance/invoiceAccess/index.vue

@@ -48,6 +48,14 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="queryParams.remark"
+            clearable
+            placeholder="请输入备注"
+            size="small"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -269,9 +277,9 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              return Math.round(prev + curr * 100) / 100;
+              return (Number(prev) + Number(curr)).toFixed(2);
             } else {
-              return Math.round(prev * 100) / 100;
+              return Number(prev).toFixed(2);
             }
           }, 0);
           sums[index];

src/views/finance/invoiceDestroy/detailsPage.vue

@@ -313,9 +313,9 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              return prev + curr;
+              return (Number(prev) + Number(curr)).toFixed(2);
             } else {
-              return prev;
+              return Number(prev).toFixed(2);
             }
           }, 0);
           sums[index];

src/views/finance/invoiceDestroy/index.vue

@@ -48,6 +48,14 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="queryParams.remark"
+            clearable
+            placeholder="请输入备注"
+            size="small"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -260,9 +268,9 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              return Math.round(prev + curr * 100) / 100;
+              return (Number(prev) + Number(curr)).toFixed(2);
             } else {
-              return Math.round(prev * 100) / 100;
+              return Number(prev).toFixed(2);
             }
           }, 0);
           sums[index];

src/views/finance/invoicePayment/detailsPage.vue

@@ -331,9 +331,9 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              return prev + curr;
+              return (Number(prev) + Number(curr)).toFixed(2);
             } else {
-              return prev;
+              return Number(prev).toFixed(2);
             }
           }, 0);
           sums[index];
@@ -402,7 +402,7 @@ export default {
       })
     },
     ttCoIdChange(id) {
-      if (id != null) {
+      if (id) {
         getCorps(id).then(res => {
           this.$set(this.queryParams, 'cdbName', res.data.corp.fBankname)
           this.$set(this.queryParams, 'cdbNo', res.data.corp.fBankno)

src/views/finance/invoicePayment/index.vue

@@ -48,6 +48,14 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="queryParams.remark"
+            clearable
+            placeholder="请输入备注"
+            size="small"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -232,9 +240,9 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              return Math.round(prev + curr * 100) / 100;
+              return (Number(prev) + Number(curr)).toFixed(2);
             } else {
-              return Math.round(prev * 100) / 100;
+              return Number(prev).toFixed(2);
             }
           }, 0);
           sums[index];

src/views/finance/invoicePaymentAccess/detailsPage.vue

@@ -204,7 +204,7 @@
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
           <el-button
-            :disabled="queryParams.auditType == 2"
+            :disabled="queryParams.auditType == 2 || queryParams.auditType == 3"
             icon="el-icon-delete"
             size="mini"
             type="text"
@@ -324,7 +324,7 @@
             <td class="column">付款类型</td>
             <td class="column" colspan="2">{{ printData.payTypes }}</td>
             <td class="column">支票号</td>
-            <td class="column" colspan="2">{{ printData.chequeNo }}</td>
+            <td class="column" >{{ printData.chequeNo }}</td>
             <td class="column">备注</td>
             <td class="column" colspan="4">{{ printData.remark }}</td>
           </tr>
@@ -334,20 +334,20 @@
             <td class="column">序号</td>
             <td class="column">发票号</td>
             <td class="column" colspan="3">开票公司</td>
-            <td class="column" colspan="3">项目名称</td>
+<!--            <td class="column" colspan="3">项目名称</td>-->
 <!--            <td class="column">金额</td>-->
             <td class="column">付款金额</td>
-            <td class="column" colspan="3">备注</td>
+            <td class="column" colspan="6">备注</td>
           </tr>
           <!-- feeDoList -->
           <tr v-for="(item,index) in xsckXzprintDataList" :key="index">
             <td class="column">{{ Number(index) + 1 }}</td>
             <td class="column">{{ item.invoiceNo }}</td>
             <td class="column" colspan="3">{{ item.fSbuName }}</td>
-            <td class="column" colspan="3">{{ item.fGoodsName }}</td>
+<!--            <td class="column" colspan="3">{{ item.fGoodsName }}</td>-->
 <!--            <td class="column">{{ item.sumMoney }}</td>-->
             <td class="column">{{ item.proceeds }}</td>
-            <td class="column" colspan="3">{{ item.remark }}</td>
+            <td class="column" colspan="6">{{ item.remark }}</td>
           </tr>
 
           <tr>
@@ -546,9 +546,9 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              return prev + curr;
+              return (Number(prev) + Number(curr)).toFixed(2);
             } else {
-              return prev;
+              return Number(prev).toFixed(2);
             }
           }, 0);
           sums[index];

src/views/finance/invoicePaymentAccess/index.vue

@@ -48,6 +48,14 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="queryParams.remark"
+            clearable
+            placeholder="请输入备注"
+            size="small"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -112,7 +120,6 @@
         <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
           <template slot-scope="scope">
             <el-button
-                v-hasPermi="['warehouse:payment:edit']"
                 icon="el-icon-edit"
                 size="mini"
                 type="text"
@@ -120,7 +127,7 @@
             >修改
             </el-button>
             <el-button
-                v-hasPermi="['warehouse:payment:remove']"
+              :disabled="scope.row.auditType == '审核中' || scope.row.auditType == '审核通过'"
                 icon="el-icon-delete"
                 size="mini"
                 type="text"
@@ -257,9 +264,9 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              return Math.round(prev + curr * 100) / 100;
+              return (Number(prev) + Number(curr)).toFixed(2);
             } else {
-              return Math.round(prev * 100) / 100;
+              return Number(prev).toFixed(2);
             }
           }, 0);
           sums[index];

src/views/index.vue

@@ -49,16 +49,16 @@
                 <p>新增物资</p>
               </div>
             </li>
-            <li @click="jump('/finance/chargeInvoice')">
-              <div>
-                <i
-                  class="el-icon-wallet"
-                  style="font-size: 25px; text-align: center"
-                ></i>
-                <p>发票申请</p>
-              </div>
-            </li>
-            <li @click="jump('/finance/salesInvoice')">
+<!--            <li @click="jump('/finance/chargeInvoice')">-->
+<!--              <div>-->
+<!--                <i-->
+<!--                  class="el-icon-wallet"-->
+<!--                  style="font-size: 25px; text-align: center"-->
+<!--                ></i>-->
+<!--                <p>发票申请</p>-->
+<!--              </div>-->
+<!--            </li>-->
+            <li @click="jump('/finance/invoiceDestroy')">
               <div>
                 <i
                   class="el-icon-money"
@@ -67,7 +67,7 @@
                 <p>销项发票</p>
               </div>
             </li>
-            <li @click="jump('')">
+            <li @click="jump('/finance/invoiceAccess')">
               <div>
                 <i
                   class="el-icon-s-management"
@@ -76,7 +76,7 @@
                 <p>进项发票</p>
               </div>
             </li>
-            <li @click="jump('/finance/charge')">
+            <li @click="jump('/finance/invoicePayment')">
               <div>
                 <i
                   class="el-icon-takeaway-box"
@@ -85,7 +85,7 @@
                 <p>收款</p>
               </div>
             </li>
-            <li @click="jump('/finance/payment')">
+            <li @click="jump('/finance/invoicePaymentAccess')">
               <div>
                 <i
                   class="el-icon-s-order"