From 82582ea05bacfd50137ad07381e0f9b3c69b713a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 14:21:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductionPlanQuery/index.vue             |  6 +--
 .../PurchaseContractApproval/index.vue        | 21 ++--------
 .../TechnologyCenter/QueryParts/index.vue     | 10 ++---
 .../ArrivalStateSearch/index.vue              | 12 ++++--
 .../InvoiceSettlementApplication1/index.vue   | 42 +------------------
 .../ProcurementContractEnquiry/index.vue      |  6 +--
 .../ProjectTotalSearch/index.vue              | 10 ++---
 .../PurchaseContractRequestFund1/index.vue    |  8 ++--
 8 files changed, 35 insertions(+), 80 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
index dc8254f2..1d4e73b9 100644
--- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
@@ -37,7 +37,7 @@
         :data="tableData"
         :row-class-name="tableRowClassName"
         height="570"
-        style="width: 960px; margin: 3px 0"
+        style="width: 1000px; margin: 3px 0"
         size="mini"
         border
         highlight-current-row
@@ -63,7 +63,7 @@
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划投产" align="center" width="80">
+        <el-table-column label="计划投产数" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.投产总数量 }}
           </template>
@@ -78,7 +78,7 @@
             {{ scope.row.投产批次 }}
           </template>
         </el-table-column>
-        <el-table-column label="投产" align="center" width="80">
+        <el-table-column label="批次投产数" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
index 9ba54063..9b1bdfd9 100644
--- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
@@ -22,26 +22,11 @@
       </el-select>
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
-      <el-button
-        type="primary"
-        plain
-        size="small"
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
     </el-card>
 
     <el-card>
-      <el-table
-        v-loading="loading1"
-        :data="tableData1"
-        size="mini"
-        stripe
-        border
-        style="width: 100%;max-height: 450px;"
-        height="450px"
-        highlight-current-row
-        @row-click="searchTable2">
+      <el-table v-loading="loading1" :data="tableData1" size="mini" stripe border style="width: 100%;max-height: 450px;" height="450px" highlight-current-row @row-click="searchTable2">
         <el-table-column label="展开" align="center" type="expand">
           <template slot-scope="scope">
             <el-form id="table" label-position="left" inline class="demo-table-expand">
@@ -130,7 +115,7 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="未通过原因" prop="未通过原因">
+        <el-form-item v-show="form2.审批是否通过!==2" label="未通过原因" prop="未通过原因">
           <el-input v-model="form2.未通过原因" :disabled="form2.审批是否通过!==2" size="small"/>
         </el-form-item>
       </el-form>
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 442d395c..39ac82c3 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -298,11 +298,11 @@ export default {
     }
   },
   watch: {
-    machine(val) {
-      if (val.length > 0) {
-        this.machineValue = val[0].value
-      }
-    },
+    // machine(val) {
+    //   if (val.length > 0) {
+    //     this.machineValue = val[0].value
+    //   }
+    // },
     machineValue(val) {
       this.groupValue = ''
       this.group = []
diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
index 7e2e16d7..af415afe 100644
--- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
@@ -14,18 +14,23 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="" :data="tableData" stripe border style="width: 100%;max-height: 600px;margin-top: 10px" height="600px" size="mini">
+      <el-table v-loading="" :data="tableData" stripe border style="width: 740px;margin-top: 10px" height="600px" size="mini">
         <el-table-column label="采购合同编号" align="center" width="140">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
+        <el-table-column label="机床图号" align="center" width="140">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件名称" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" width="130">
+        <el-table-column label="图号或型号" align="center" width="160">
           <template slot-scope="scope">
             {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.组号 }}
           </template>
@@ -40,7 +45,7 @@
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="已到货数量" align="center" width="100">
+        <el-table-column label="到货数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.已到货数量 }}
           </template>
@@ -91,6 +96,7 @@ export default {
     },
     searchTable() {
       searchArrivalState(this.contractNumValue).then(response => {
+        console.log(response.data)
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].物料型号 === '' || response.data[i].物料型号 === null) {
             response.data[i].物料型号 = response.data[i].零件图号
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index aeca874a..9e42c548 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -1,47 +1,14 @@
 <template>
   <div class="app-container">
     <el-card>
-      <!--      <span>发票号:</span>-->
       <el-input v-model="invoiceNum" placeholder="发票号\供应商" size="small" clearable/>
       <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       <el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">到票</el-button>
     </el-card>
 
     <el-card>
-      <h4 style="margin: 5px">到票结算申请单</h4>
+      <h5 style="margin: 5px">到票结算申请单</h5>
       <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
-        <!--        <el-table-column label="详情" type="expand">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-form label-position="left" inline class="demo-table-expand">-->
-        <!--              <el-row>-->
-        <!--                <el-col :span="6">-->
-        <!--                  <viewer>-->
-        <!--                    <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
-        <!--                  </viewer>-->
-        <!--                </el-col>-->
-        <!--                <el-col :span="6">-->
-        <!--                  <el-form-item label="已付款项">-->
-        <!--                    <span>{{ scope.row.已付款项 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                  <el-form-item label="尚欠金额">-->
-        <!--                    <span>{{ scope.row.尚欠金额 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                  <el-form-item label="备注">-->
-        <!--                    <span>{{ scope.row.备注 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                </el-col>-->
-        <!--                <el-col :span="6">-->
-        <!--                  <el-form-item label="是否费用类发票">-->
-        <!--                    <span>{{ scope.row.是否费用类 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                  <el-form-item label="税额">-->
-        <!--                    <span>{{ scope.row.税额 }}</span>-->
-        <!--                  </el-form-item>-->
-        <!--                </el-col>-->
-        <!--              </el-row>-->
-        <!--            </el-form>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
         <el-table-column label="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -127,7 +94,7 @@
     </el-card>
 
     <el-card>
-      <h4 style="margin: 5px;display: inline-block;width: 150px;">到票结算申请单明</h4>
+      <h5 style="margin: 5px;display: inline-block;width: 150px;">到票结算申请单明</h5>
       <span>发票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
       <el-button :disabled="disabled" type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
@@ -152,11 +119,6 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
         <el-table-column label="合同编号" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index b4e0debd..4faca879 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -39,7 +39,7 @@
           size="small"
           plain
           icon="el-icon-search"
-          @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+          @click="total1=0;pageCurrent1=1;pageSize1=20;searchTable1()">查询</el-button>
         <el-button
           type="primary"
           size="small"
@@ -120,7 +120,7 @@
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[20, 30, 40, 50]"
           :page-size="pageSize1"
           :total="total1"
           style="display:inline-block;width:50%"
@@ -436,7 +436,7 @@ export default {
       supplierValue: '',
       total1: 0,
       pageCurrent1: 1,
-      pageSize1: 10,
+      pageSize1: 20,
       tableData1: [],
       loading1: false,
       dialogVisible1: false,
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index 4d2af4fe..de6aa7bf 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 44%">
-      <span>项目名称:</span>
+    <el-card style="width: 800px">
+      <!--<span>项目名称:</span>-->
       <el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 180px" filterable clearable>
         <el-option
           v-for="item in project"
@@ -22,16 +22,16 @@
         plain
         icon="el-icon-download"
         style="margin-left:10px"
-        @click="exportExcel()">导出项目采购明细</el-button>
+        @click="exportExcel()">导出</el-button>
     </el-card>
-    <el-card style="width: 54%">
+    <el-card style="width: 800px">
       <el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
         <el-table-column label="零件名称" align="center" width="150">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" width="150">
+        <el-table-column label="图号或型号" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index b55585ca..9a62e700 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -133,6 +133,7 @@
         </el-card>
       </el-col>
     </el-row>
+
     <el-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1200px">
       <span>供应商：</span>
       <el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small" @change="searchTable01()">
@@ -166,17 +167,17 @@
         </el-table-column>
         <el-table-column label="合同总额(元)" align="center" width="110" prop="合同总额">
           <template slot-scope="scope">
-            {{ scope.row.含税总金额 }}
+            {{ parseFloat(scope.row.含税总金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="已付金额(元)" align="center" min-width="100" prop="已付金额">
           <template slot-scope="scope">
-            {{ scope.row.已付金额 }}
+            {{ parseFloat(scope.row.已付金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="申请中金额(元)" align="center" min-width="100" prop="申请中金额">
           <template slot-scope="scope">
-            {{ scope.row.申请中金额 }}
+            {{ parseFloat(scope.row.申请中金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="请款金额(元)" align="center" min-width="130" prop="请款金额">
@@ -359,6 +360,7 @@ export default {
         this.contractGroup.push(val[i].采购合同流水号)
         this.sumGroup.push(val[i].请款金额)
       }
+      this.SUM = parseFloat(this.SUM).toFixed(2)
     },
     submitRequestFund() { // 确认请款
       if (this.supplierValue && this.contractGroup.length !== 0) {