diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index 918dc368..a22238ad 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -76,6 +76,11 @@
             {{ scope.row.招标企业 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="保证金金额(万元)" width="100">
           <template slot-scope="scope">
             <span style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</span>
@@ -141,11 +146,7 @@
         <!--<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="mini" style="width: 66px">已拖期</el-tag>-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column align="center" label="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
+
         <el-table-column align="center" label="联系人" width="80">
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
@@ -664,10 +665,11 @@ export default {
           //   val.data[i].投标日期 = val.data[i].投标日期.substring(0, val.data[i].投标日期.length - 8)
           // }
           if (parseInt(val.data[i].是否收回) !== 2) {
-            val.data[i].应收回金额 = '未收回'
+            val.data[i].产品品种代码 = '未收回'
           } else {
-            val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
+            val.data[i].产品品种代码 = (val.data[i].应收回金额).toFixed(2)
           }
+          val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
           val.data[i].保证金金额 = (val.data[i].保证金金额).toFixed(2)
           val.data[i].中标服务费 = (val.data[i].中标服务费).toFixed(2)
           val.data[i].未收金额 = (val.data[i].未收金额).toFixed(2)
@@ -675,8 +677,8 @@ export default {
         }
         if (val.length !== 0) {
           import('@/vendor/Export2Excel').then(excel => {
-            const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约金(万元)', '已收(万元)', '未收(万元)', '保证金备注']
-            const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '未收金额', '备注']
+            const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约保证金(万元)', '应收(万元)', '已收(万元)', '未收(万元)', '保证金备注']
+            const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '产品品种代码', '未收金额', '备注']
             const list = val.data
             const data = this.formatJson(filterVal, list)
             excel.export_json_to_excel({
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 22b4d2f0..d401b3bb 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -14,8 +14,8 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-col :span="17.6">
-        <el-table v-loading="listLoading" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" stripe highlight-current-row style="margin-top: 3px" height="580" border size="mini" @row-click="selectMachine">
+      <el-col :span="17.8">
+        <el-table v-loading="listLoading" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" stripe highlight-current-row style="margin-top: 3px;width: 985px" height="580" border size="mini" @row-click="selectMachine">
           <el-table-column align="center" label="项目名称" prop="项目名称" width="130" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.项目名称 }}
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index f1caf8f4..6467c70a 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -325,14 +325,14 @@ export default {
         }
         if (val.length !== 0) {
           import('@/vendor/Export2Excel').then(excel => {
-            const tHeader = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
-            const filterVal = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
+            const tHeader = ['合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同金额(万元)', '已收(万元)', '未收(万元)', '营销经理']
+            const filterVal = ['合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
             const list = val.data
             const data = this.formatJson(filterVal, list)
             excel.export_json_to_excel({
               header: tHeader,
               data,
-              filename: getNowShotTime(),
+              filename: '合同收款计划' + getNowShotTime(),
               autoWidth: true,
               bookType: 'xlsx'
             })
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 9a111b6a..ce14739d 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -331,8 +331,8 @@
       </div>
     </el-dialog>
     <!--新增机床对话框-->
-    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="300px">
-      <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 280px" width="280px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-width="80px">
         <el-form-item label="机床型号" prop="设备型号">
           <el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:130px"/>
         </el-form-item>
@@ -344,8 +344,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff2('form1')">取消</el-button>
-        <el-button type="primary" @click="submitMachine('form1')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff2('form1')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitMachine('form1')">确认</el-button>
       </div>
     </el-dialog>
 
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index b17d786f..3c76b860 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -513,8 +513,8 @@ export default {
         }
         if (val.length !== 0) {
           import('@/vendor/Export2Excel').then(excel => {
-            const tHeader = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '签订日期', '合同金额(万元)', '到账金额(万元)', '开票金额(万元)', '营销经理']
-            const filterVal = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '签订日期', '合同金额', '到账金额', '开票金额', '营销经理']
+            const tHeader = ['合同编号', '项目名称', '客户名称', '付款方式', '合同金额(万元)', '开票金额(万元)', '到账金额(万元)', '签订日期', '营销经理', '合同信息备注']
+            const filterVal = ['合同编号', '项目名称', '客户名称', '付款方式', '合同金额', '开票金额', '到账金额', '签订日期', '营销经理', '合同信息备注']
             const list = val.data
             const data = this.formatJson(filterVal, list)
             excel.export_json_to_excel({
@@ -882,5 +882,12 @@ export default {
   >>>.el-form-item {
     margin-bottom: 13px;
   }
+  .el-table td.gutter,.el-table th.gutter{
+    width: 15px;
+    border-right-width: 0;
+    border-bottom-width: 0;
+    padding: 30px;
+    background: white;
+  }
 </style>
 
diff --git a/src/views/MarketingCenter/MarginManagement/index.vue b/src/views/MarketingCenter/MarginManagement/index.vue
index 9a508e72..408ce091 100644
--- a/src/views/MarketingCenter/MarginManagement/index.vue
+++ b/src/views/MarketingCenter/MarginManagement/index.vue
@@ -24,7 +24,7 @@ export default {
   },
   data() {
     return {
-      handle: '',
+      handle: '投标保证金',
       tabName: '投标保证金'
     }
   },
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 073c8911..cbae4c9f 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -130,7 +130,7 @@
             highlight-current-row
             @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
-            <el-table-column align="center" label="进程" prop="询价状态编号" min-width="100px" width="60px">
+            <el-table-column align="center" label="进程" prop="询价状态编号" width="60px">
               <template slot-scope="scope">
                 <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
                 <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -299,23 +299,40 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">查询</el-button>
-          <el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">未分配</el-radio>
-          <el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-radio>
-          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 120px">
+          <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">查询</el-button>
+          <el-checkbox v-model="checked2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-checkbox>
+          <!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">未分配</el-radio>-->
+          <!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-radio>-->
+          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 160px">
             <el-option
               v-for="item in person"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask1">分配</el-button>
-          <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">打回</el-button>
+          <el-tooltip :open-delay="1000" effect="dark" content="采购任务分配到采购员" placement="top">
+            <el-button
+              type="distribution"
+              size="small"
+              icon="el-icon-menu"
+              style="margin-left: 10px"
+              @click="allocateTask1">分配</el-button>
+          </el-tooltip>
+          <el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
+            <el-button
+              type="repulse"
+              size="small"
+              icon="el-icon-back"
+              style="margin-left: 10px"
+              @click="executeReturn1">打回</el-button>
+          </el-tooltip>
+          <!--<el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask1">分配</el-button>-->
+          <!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">打回</el-button>-->
         </el-row>
         <el-row style="margin-bottom: 10px">
           <el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1255px" border stripe @selection-change="handleSelectionChange1">
-            <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" prop="询价状态编号" label="采购状态" min-width="100px" width="80px">
+            <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
+            <el-table-column align="center" prop="询价状态编号" label="进程" min-width="100px" width="60px">
               <template slot-scope="scope">
                 <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
                 <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -343,7 +360,7 @@
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="100px">
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
@@ -353,12 +370,12 @@
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px" width="80px">
+            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.物料类别 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="物料品种" prop="物料品种" min-width="100px" width="100px">
+            <el-table-column align="center" label="物料品种" prop="物料品种" min-width="100px" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.物料品种 }}
               </template>
@@ -368,7 +385,7 @@
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="100px" show-overflow-tooltip>
+            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供货商 }}
               </template>
@@ -451,36 +468,53 @@
           <!--:value="item.value"/>-->
           <!--</el-select>-->
           <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>-->
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">查询</el-button>
-          <el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">未分配</el-radio>
-          <el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-radio>
-          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
+          <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">查询</el-button>
+          <el-checkbox v-model="checked3" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-checkbox>
+          <!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">未分配</el-radio>-->
+          <!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-radio>-->
+          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 470px">
             <el-option
               v-for="item in person"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>
-          <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>
+          <el-tooltip :open-delay="1000" effect="dark" content="采购任务分配到采购员" placement="top">
+            <el-button
+              type="distribution"
+              size="small"
+              icon="el-icon-menu"
+              style="margin-left: 10px"
+              @click="executeReturn2">分配</el-button>
+          </el-tooltip>
+          <el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
+            <el-button
+              type="repulse"
+              size="small"
+              icon="el-icon-back"
+              style="margin-left: 10px"
+              @click="allocateTask2">打回</el-button>
+          </el-tooltip>
+          <!--<el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>-->
+          <!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
         </el-row>
         <el-row style="margin-bottom: 10px">
-          <el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1520px" border stripe @selection-change="handleSelectionChange2">
-            <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" prop="询价状态编号" label="采购状态" min-width="80px" width="80px">
+          <el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1303px" border stripe @selection-change="handleSelectionChange2">
+            <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
+            <el-table-column align="center" prop="询价状态编号" label="进程" min-width="80px" width="60px">
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
-                <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
-                <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-                <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+                <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
+                <span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="零件图号" label="图号" min-width="120px" width="180px">
+            <el-table-column align="center" prop="零件图号" label="零件图号" min-width="120px" width="180px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="零件名称" label="名称" width="140px" show-overflow-tooltip>
+            <el-table-column align="center" prop="零件名称" label="名称" width="160px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
@@ -500,11 +534,11 @@
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px" width="140px">
-              <template slot-scope="scope">
-                {{ scope.row.项目名称 }}
-              </template>
-            </el-table-column>
+            <!--<el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px" width="140px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.项目名称 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -520,7 +554,7 @@
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="190" show-overflow-tooltip>
+            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供货商 }}
               </template>
@@ -701,7 +735,9 @@ export default {
       pageCurrent2: 1,
       pageSize2: 50,
       total2: 0,
-      checked: false
+      checked: false,
+      checked2: false,
+      checked3: false
     }
   },
   computed: {
@@ -895,6 +931,7 @@ export default {
       this.materialName ? this.check4 = 1 : this.check4 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
+      this.checked2 ? this.radio = 2 : this.radio = 1
       searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
@@ -911,6 +948,7 @@ export default {
       this.partMaterial ? check4 = 1 : check4 = 0
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
+      this.checked3 ? this.radio = 2 : this.radio = 1
       searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index f6ee51cc..da077a05 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -22,7 +22,7 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="AdvanceCharge" size="small" style="width: 120px" placeholder="预付款"/>
-        <el-select v-model="currencyValue" placeholder="币种" style="width: 120px" size="small" clearable>
+        <el-select v-model="currencyValue" placeholder="币种" style="width: 100px" size="small" clearable>
           <el-option
             v-for="item in currency"
             :key="item.value"
@@ -37,9 +37,9 @@
           value-format="yyyy-MM-dd"
           placeholder="规定到货时间"/>
         <el-input v-model="name" placeholder="采购员" style="width: 120px" size="small" readonly/>
-        <el-input v-model="taxRate" placeholder="税率" style="width: 120px" size="small"/>
+        <el-input v-model="taxRate" placeholder="税率" style="width: 100px" size="small"/>
         <el-button v-show="contractNumType===0" type="primary" plain size="small" @click="linkGroup">成组采购</el-button>
-        <el-button v-show="contractNumType===1" type="danger" plain size="small" @click="unLinkGroup">取消成组采购</el-button>
+        <el-button v-show="contractNumType===1" type="danger" style="margin: 0px" plain size="small" @click="unLinkGroup">取消成组采购</el-button>
       </el-row>
     </el-card>
     <el-card>
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index da1bcb49..77dfdbee 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>发票号:</span>
-      <el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
+      <!--      <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-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-top: 5px">发票结算申请单</h4>
+      <h4 style="margin: 5px">到票结算申请单</h4>
       <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">
@@ -127,7 +127,7 @@
     </el-card>
 
     <el-card>
-      <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
+      <h4 style="margin: 5px;display: inline-block;width: 150px;">到票结算申请单明</h4>
       <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>
@@ -184,8 +184,8 @@
       </el-table>
     </el-card>
 
-    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="650px">
-      <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="90px">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="680px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="发票号" prop="invoiceNum">
@@ -193,8 +193,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="发票金额" prop="money">
-              <el-input v-model="form1.money" size="small" placeholder="发票金额"/>
+            <el-form-item label="发票金额(元)" prop="money">
+              <el-input v-positive="'float'" v-model="form1.money" type="float" size="small" placeholder="发票金额"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -211,14 +211,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="尚欠金额">
+            <el-form-item label="尚欠金额(元)">
               <el-input v-model="form1.unpaid" size="small" placeholder="尚欠金额"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="税额">
+            <el-form-item label="税额(元)">
               <el-input v-model="form1.tax" size="small" placeholder="税额"/>
             </el-form-item>
           </el-col>
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 74030d17..8262f163 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -113,7 +113,7 @@
         <el-table-column label="操作" align="center" min-width="100px">
           <template slot-scope="scope">
             <el-button type="text" plain size="mini" icon="el-icon-printer" @click="exportTable()">打印</el-button>
-            <el-button type="text" plain size="mini" icon="el-icon-back" @click="Disable(scope.row)">打回</el-button>
+            <el-button :disabled="scope.row.审批情况内容==='通过审批'" type="text" plain size="mini" icon="el-icon-back" @click="Disable(scope.row)">打回</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index 11872e98..2ed5b6d0 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -24,7 +24,7 @@
         style="margin-left:10px"
         @click="exportExcel()">导出项目采购明细</el-button>
     </el-card>
-    <el-card style="width: 44%">
+    <el-card style="width: 54%">
       <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">
@@ -48,12 +48,12 @@
         </el-table-column>
         <el-table-column label="单价(元)" align="center" width="100">
           <template slot-scope="scope">
-            {{ scope.row.单价 }}
+            {{ scope.row.单价.toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="小计(元)" align="center" width="120" prop="金额">
           <template slot-scope="scope">
-            {{ scope.row.金额 }}
+            {{ scope.row.金额.toFixed(2) }}
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index d25cbdfc..bf968e1b 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>时间段:</span>
+      <!--      <span>时间段:</span>-->
       <el-date-picker
         v-model="dateRange"
         :picker-options="pickerOptions"
@@ -11,11 +11,11 @@
         value-format="yyyy-MM-dd"
         format="yyyy-MM-dd"
         range-separator="～"
-        style="width:300px"
+        style="width:300px;margin-right: 10px;"
         start-placeholder="开始日期"
         end-placeholder="结束日期"/>
-      <span>供应商：</span>
-      <el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="totalSum=0;totalPay=0;totalDebt=0;">
+      <!--      <span>供应商：</span>-->
+      <el-select v-model="supplierValue" placeholder="供应商" style="margin-right: 10px" filterable size="small" clearable @change="totalSum=0;totalPay=0;totalDebt=0;">
         <el-option
           v-for="item in supplier"
           :key="item.value"
@@ -29,13 +29,13 @@
         icon="el-icon-search"
         style="margin-left: 10px"
         @click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
-      <el-button type="distribution" size="small" icon="el-icon-goods" style="" @click="requestFund">新增请款</el-button>
+      <el-button type="distribution" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
     </el-card>
     <el-row>
-      <el-col style="width: 1200px">
+      <el-col style="width: 940px">
         <el-card>
           <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe @row-click="searchTable02">
-            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="340">
+            <el-table-column label="供应商" prop="供应商名称" align="center" width="230" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供应商名称 }}
               </template>
@@ -56,19 +56,19 @@
               </template>
             </el-table-column>
             <!--        <el-table-column label="请款付款情况" align="center">-->
-            <el-table-column label="审批情况内容" width="100" align="center">
+            <el-table-column label="审批情况" width="80" align="center">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</span>
                 <span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</span>
                 <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</span>
               </template>
             </el-table-column>
-            <el-table-column label="未通过审批原因" width="130" align="center">
+            <el-table-column label="未通过原因" width="100" align="center">
               <template slot-scope="scope">
                 {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
               </template>
             </el-table-column>
-            <el-table-column label="付款情况" width="100" align="center">
+            <el-table-column label="付款情况" width="80" align="center">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</span>
                 <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</span>
@@ -81,7 +81,7 @@
               </template>
             </el-table-column>
             <!--        </el-table-column>-->
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="50">
               <template slot-scope="scope">
                 <el-tooltip :open-delay="1000" effect="dark" content="取消请款" placement="top">
                   <div style="display: inline-block">
@@ -110,23 +110,23 @@
           </div>
         </el-card>
       </el-col>
-      <el-col style="width: 500px">
+      <el-col style="width: 440px">
         <el-card>
           <el-table :data="gridData" highlight-current-row size="mini" show-summary>
             <el-table-column width="50" align="center" type="index" label="序号"/>
-            <el-table-column min-width="150" align="center" label="采购合同编号">
+            <el-table-column min-width="120" 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 min-width="120" align="center" label="已付金额(元)" prop="已付金额">
               <template slot-scope="scope">
-                {{ scope.row.已付金额 }}
+                {{ scope.row.已付金额.toFixed(2) }}
               </template>
             </el-table-column>
-            <el-table-column min-width="100" align="center" label="请款金额" prop="请款金额">
+            <el-table-column min-width="120" align="center" label="请款金额(元)" prop="请款金额">
               <template slot-scope="scope">
-                {{ scope.row.请款金额 }}
+                {{ scope.row.请款金额.toFixed(2) }}
               </template>
             </el-table-column>
           </el-table>
@@ -394,6 +394,7 @@ export default {
     searchTable02(row) { // 查看详情（请款信息包含的合同）
       searchRequsetFundDetail(row.采购合同请款流水号).then(response => {
         this.gridData = response.data
+        console.log(response, 123123)
       })
     },
     cancelRequestFund(row) { // 取消请款