采购合同审批123

src/views/PurchasingCenter/FundApproval1/index.vue

@@ -59,7 +59,7 @@
       </div>
     </el-card>
     <h3 style="">合同明细</h3>
-    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
+    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" stripe show-summary>
       <el-table-column label="合同编号" align="center" min-width="150">
         <template slot-scope="scope">
           {{ scope.row.合同类型 === 1 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
@@ -80,19 +80,19 @@
           {{ scope.row.物料型号 }}
         </template>
       </el-table-column>
-      <el-table-column label="数量" align="center" min-width="80">
+      <el-table-column label="数量" align="center" min-width="100">
         <template slot-scope="scope">
           {{ scope.row.数量 }}
         </template>
       </el-table-column>
-      <el-table-column label="单价" align="center" min-width="80" prop="单价">
+      <el-table-column label="单价" align="center" min-width="100" prop="单价">
         <template slot-scope="scope">
-          {{ scope.row.单价 }}
+          {{ parseFloat(scope.row.单价||0).toFixed(2) }}
         </template>
       </el-table-column>
-      <el-table-column label="合计" align="center" min-width="80" prop="合计">
+      <el-table-column label="合计" align="center" min-width="100" prop="合计">
         <template slot-scope="scope">
-          {{ parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0) }}
+          {{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
         </template>
       </el-table-column>
       <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
@@ -100,11 +100,16 @@
           {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" min-width="80" prop="备注">
+      <el-table-column label="备注" align="center" min-width="150" prop="备注">
         <template slot-scope="scope">
           {{ scope.row.备注 }}
         </template>
       </el-table-column>
+      <el-table-column label="到货数量" align="center" min-width="100">
+        <template slot-scope="scope">
+          {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
@@ -162,7 +167,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总价'
-        } else if (index === 7) {
+        } else if (index === 6) {
           const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -173,7 +178,7 @@ export default {
                 return prev
               }
             }, 0)
-            sums[index] += ' 元'
+            sums[index] = sums[index].toFixed(2) + ' 元'
           } else {
             sums[index] = 'N/A'
           }

src/views/PurchasingCenter/FundApproval2/index.vue

@@ -26,11 +26,11 @@
         <el-table-column label="审核" align="center" width="320">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData1" stripe size="mini" highlight-current-row show-summary @row-click="searchContactDetail">
+              <el-table :data="gridData1" :summary-method="getSummaries2" stripe size="mini" highlight-current-row show-summary @row-click="searchContactDetail">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="采购合同编号">
                   <template slot-scope="scope">
-                    {{ scope.row.采购合同编号 }}
+                    {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
                   </template>
                 </el-table-column>
                 <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
@@ -58,106 +58,59 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-
+    <h3 style="">合同明细</h3>
-    <el-card>
+    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" stripe show-summary>
-      <h3 style="margin-top: 0">离线合同</h3>
+      <el-table-column label="合同编号" align="center" min-width="150">
-      <el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="供应商" align="center" min-width="170">
         <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
+          {{ scope.row.合同类型 === 1 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
         </template>
       </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="150">
+      <el-table-column label="物料名称" align="center" min-width="150">
         <template slot-scope="scope">
-            {{ scope.row.请款时间 }}
+          {{ scope.row.物料名称 }}
         </template>
       </el-table-column>
-        <el-table-column label="请款人" align="center" min-width="100">
+      <el-table-column label="物料规格" align="center" min-width="200">
         <template slot-scope="scope">
-            {{ scope.row.姓名 }}
+          {{ scope.row.物料规格 }}
         </template>
       </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
+      <el-table-column label="物料型号" align="center" min-width="200">
         <template slot-scope="scope">
-            {{ scope.row.请款金额 }}
+          {{ scope.row.物料型号 }}
         </template>
       </el-table-column>
-        <el-table-column label="审核" align="center" width="320">
+      <el-table-column label="数量" align="center" min-width="100">
         <template slot-scope="scope">
-            <el-popover placement="right" width="400" trigger="click">
+          {{ scope.row.数量 }}
-              <el-table :data="gridData2" stripe size="mini" highlight-current-row show-summary @row-click="searchOfflineContactDetail">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="离线合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.离线合同编号 }}
         </template>
       </el-table-column>
-                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
+      <el-table-column label="单价" align="center" min-width="100" prop="单价">
         <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
+          {{ parseFloat(scope.row.单价||0).toFixed(2) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="合计" align="center" min-width="100" prop="合计">
+        <template slot-scope="scope">
+          {{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
+        <template slot-scope="scope">
+          {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" min-width="150" prop="备注">
+        <template slot-scope="scope">
+          {{ scope.row.备注 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="到货数量" align="center" min-width="100">
+        <template slot-scope="scope">
+          {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
         </template>
       </el-table-column>
     </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
-            </el-popover>
-            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApprovalOffline(scope.row)">不通过</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-    <h3 id="firstAnchor" style="margin-top: 0">采购合同</h3>
-    <div id="print" class="print" style="background-color:white;min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/><hr>
-    <h3 id="secondAnchor" style="">离线合同</h3>
-    <div id="offlineContract" style="background-color:white;min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">
-      <table v-show="contractDetail2.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
-        <tr>
-          <th colspan="14"><h1>离线合同</h1></th>
-        </tr>
-        <tr>
-          <td colspan="3" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
-          <td width="80px">合同名称</td>
-          <td id="contractName" colspan="2" style="text-align: left;"/>
-          <td width="80px">供应商</td>
-          <td id="supplier" colspan="5" style="text-align: left;"/>
-          <td id="qrCode" colspan="2" rowspan="2"/>
-        </tr>
-        <tr>
-          <td width="80px">合同编号</td>
-          <td id="contractNum" colspan="2" style="text-align: left;"/>
-          <td width="80px">采购员</td>
-          <td id="buyer" colspan="5" style="text-align: left;"/>
-        </tr>
-        <tr id="tablehead">
-          <td width="50px">序号</td>
-          <td colspan="2">名称</td>
-          <td>规格</td>
-          <td colspan="2">型号</td>
-          <td>数量</td>
-          <td colspan="2">单价</td>
-          <td colspan="2">合计</td>
-          <td>交货期</td>
-          <td colspan="2">备注</td>
-        </tr>
-        <tr>
-          <td>总计</td>
-          <td id="remark" colspan="10"/>
-          <td id="total" colspan="2" style="text-align: left;"/>
-          <td/>
-        </tr>
-      </table>
-    </div>
   </div>
 </template>
 
@@ -196,8 +149,33 @@ export default {
     this.fetchData()
   },
   methods: {
+    getSummaries2(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总价'
+          return
+        } else if (index === 2 || index === 3) {
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
     showOffline(row) {
-      console.log(row, 222)
       const children = document.getElementsByClassName('tableData')
       const parent = document.getElementsByClassName('offlineContract')[0]
       if (children.length !== 0) {
@@ -236,13 +214,13 @@ export default {
       document.getElementById('remark').innerHTML = row.离线合同备注
     },
     searchContactDetail(row) {
-      document.documentElement.scrollTop = this.$el.querySelector('#firstAnchor').offsetTop
+      var check
-      searchContactDetail(row.采购合同流水号).then(response => {
+      row.采购合同流水号 ? check = 1 : check = 2
-        this.contractDetail1 = response.data[0].合同内容
+      searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => {
+        this.contractDetail2 = response.data
       })
     },
     searchOfflineContactDetail(row) { // 查询离线合同明细
-      document.documentElement.scrollTop = this.$el.querySelector('#secondAnchor').offsetTop
       searchMateriel(row.离线合同流水号).then(response => {
         this.contractDetail2 = response.data
         this.showOffline(row)
@@ -254,7 +232,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总价'
-        } else if (index === 7) {
+        } else if (index === 6) {
           const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -265,7 +243,7 @@ export default {
                 return prev
               }
             }, 0)
-            sums[index] += ' 元'
+            sums[index] = sums[index].toFixed(2) + ' 元'
           } else {
             sums[index] = 'N/A'
           }

src/views/PurchasingCenter/FundApproval3/index.vue

@@ -26,11 +26,11 @@
         <el-table-column label="审核" align="center" width="320">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData1" class="subTableHeader" stripe size="mini" show-summary highlight-current-row @row-click="searchContactDetail">
+              <el-table :data="gridData1" :summary-method="getSummaries2" class="subTableHeader" stripe size="mini" show-summary highlight-current-row @row-click="searchContactDetail">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="采购合同编号">
                   <template slot-scope="scope">
-                    {{ scope.row.采购合同编号 }}
+                    {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
                   </template>
                 </el-table-column>
                 <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
@@ -58,113 +58,58 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-    <el-card>
+    <h3 style="">合同明细</h3>
-      <h3 style="margin-top: 0">离线合同</h3>
+    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" stripe show-summary>
-      <el-table v-loading="" :data="tableData2" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
+      <el-table-column label="合同编号" align="center" min-width="150">
-        <el-table-column label="供应商" align="center" min-width="320">
         <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
+          {{ scope.row.合同类型 === 1 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
         </template>
       </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="140">
+      <el-table-column label="物料名称" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.请款时间.substr(0,10) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款人" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
-          <template slot-scope="scope">
-            {{ scope.row.请款金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="付款" align="center" width="320">
-          <template slot-scope="scope">
-            <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData2" class="subTableHeader" stripe size="mini" show-summary highlight-current-row @row-click="searchOfflineContactDetail">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="离线合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.离线合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="80" align="center" label="合同总额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" plain style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
-            </el-popover>
-            <el-button type="primary" size="mini" plain icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApprovalOffline(scope.row)">不通过</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-    <h3 style="margin-top: 0">采购合同</h3>
-    <div id="print" class="print" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/>
-    <h3 style="">离线合同</h3>
-    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border stripe style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
-      <el-table-column label="离线合同编号" align="center" min-width="130">
-        <template slot-scope="scope">
-          {{ scope.row.离线合同编号 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料名称" align="center" min-width="100 ">
         <template slot-scope="scope">
           {{ scope.row.物料名称 }}
         </template>
       </el-table-column>
-      <el-table-column label="物料规格" align="center" min-width="150">
+      <el-table-column label="物料规格" align="center" min-width="200">
         <template slot-scope="scope">
           {{ scope.row.物料规格 }}
         </template>
       </el-table-column>
-      <el-table-column label="物料型号" align="center" min-width="120">
+      <el-table-column label="物料型号" align="center" min-width="200">
         <template slot-scope="scope">
           {{ scope.row.物料型号 }}
         </template>
       </el-table-column>
-      <el-table-column label="数量" align="center" min-width="80">
+      <el-table-column label="数量" align="center" min-width="100">
         <template slot-scope="scope">
           {{ scope.row.数量 }}
         </template>
       </el-table-column>
-      <el-table-column label="单价" align="center" min-width="80" prop="单价">
+      <el-table-column label="单价" align="center" min-width="100" prop="单价">
         <template slot-scope="scope">
-          {{ scope.row.单价 }}
+          {{ parseFloat(scope.row.单价||0).toFixed(2) }}
         </template>
       </el-table-column>
-      <el-table-column label="合计" align="center" min-width="80" prop="合计">
+      <el-table-column label="合计" align="center" min-width="100" prop="合计">
         <template slot-scope="scope">
-          {{ parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0) }}
+          {{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
         </template>
       </el-table-column>
       <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
         <template slot-scope="scope">
-          {{ scope.row.交货期要求 }}
+          {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" min-width="80" prop="备注">
+      <el-table-column label="备注" align="center" min-width="150" prop="备注">
         <template slot-scope="scope">
           {{ scope.row.备注 }}
         </template>
       </el-table-column>
+      <el-table-column label="到货数量" align="center" min-width="100">
+        <template slot-scope="scope">
+          {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
@@ -203,9 +148,37 @@ export default {
     this.fetchData()
   },
   methods: {
+    getSummaries2(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总价'
+          return
+        } else if (index === 2 || index === 3) {
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
     searchContactDetail(row) {
-      searchContactDetail(row.采购合同流水号).then(response => {
+      var check
-        this.contractDetail1 = response.data[0].合同内容
+      row.采购合同流水号 ? check = 1 : check = 2
+      searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => {
+        this.contractDetail2 = response.data
       })
     },
     searchOfflineContactDetail(row) { // 查询离线合同明细
@@ -219,7 +192,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总价'
-        } else if (index === 7) {
+        } else if (index === 6) {
           const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -230,7 +203,7 @@ export default {
                 return prev
               }
             }, 0)
-            sums[index] += ' 元'
+            sums[index] = sums[index].toFixed(2) + ' 元'
           } else {
             sums[index] = 'N/A'
           }