Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

2018-12-17 20:28:31 +08:00
parent c5435fa539 aad83ce3ac
commit e45ebcd180
10 changed files with 325 additions and 48 deletions
--- a/src/api/MarketingCenter/PerformanceBond.js
+++ b/src/api/MarketingCenter/PerformanceBond.js
@@ -108,3 +108,25 @@ export function delPerformanceBond() {
    }
  })
 }
+export function addPerformanceGuarantee() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_履约保证金_履约保函新增',
+      param: '项目流水号=' + arguments[0]
+    }
+  })
+}
+export function delPerformanceGuarantee() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_履约保证金_履约保函_删除',
+      param: '项目流水号=' + arguments[0]
+    }
+  })
+}
--- a/src/api/PurchasingCenter/ProjectTotalSearch.js
+++ b/src/api/PurchasingCenter/ProjectTotalSearch.js
@@ -18,7 +18,7 @@ export function searchProjectTotal(num) {
    method: 'post',
    data: {
      type: '1',
-      name: '采购管理_项目总价_明细_查询数据',
+      name: '采购管理_项目采购总价_查询数据',
      param: `项目流水号=${num}`
    }
  })
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -86,7 +86,7 @@
            </el-col>
            <el-col :span="1" class="line">～</el-col>
            <el-col :span="11">
-              <el-date-picker v-model="time_machiningFinish" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
+              <el-date-picker v-model="time_machiningFinish" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
            </el-col>
          </el-form-item>
        </el-form>
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -104,14 +104,13 @@
              :file-list="fileList"
              :before-upload="beforeUpload"
              :on-success="onSuccess"
-              :action="'http://192.168.1.122:8410/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
+              :action="'http://localhost:8411/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
              list-type="picture-card">
              <i class="el-icon-plus"/>
            </el-upload>
            <el-dialog :visible.sync="dialogVisible">
              <img :src="dialogImageUrl" width="100%" alt="">
            </el-dialog>
-
          </div>
        </div></el-col>
      </el-row>
@@ -818,7 +817,7 @@ export default {
          if (response.data[0].result === '1') {
            this.$message.success('删除成功')
            this.getTable(addressSearch, [this.pageCurrent1, this.pageSize1], ['addressData', 'total1'])
-          } else { this.$message.error('数据占用') }
+          } else { this.$message.error('删除失败') }
        })
      }).catch(() => {
        this.$message({
@@ -1093,7 +1092,7 @@ export default {
        return {
          _id: item.附件号,
          name: item.文件标识,
-          url: 'http://192.168.1.122:8410/webpage/img/' + item.文件标识
+          url: 'http://localhost:8411/webpage/img/' + item.文件标识
        }
      })
    },
@@ -1107,7 +1106,7 @@ export default {
        }
      })
      if (data[0].result === '0') {
-        this.$message.error('数据占用')
+        this.$message.error('删除失败')
      }
    },
    handlePictureCardPreview(file) {
@@ -1127,7 +1126,7 @@ export default {
        this.$message.error('只能上传图片。。')
      }
      if (!isLt4M) {
-        this.$message.error('上传头像图片大小不能超过 4MB!')
+        this.$message.error('上传图片大小不能超过 4MB!')
      }

      return isJPG && isLt4M && isInvoiceNum
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -94,7 +94,7 @@
              size="mini"
              type="primary"
              icon="el-icon-circle-plus-outline"
-              @click.stop="openAddInvoiceRecordingDialog(); flag = 1">增加记录</el-button>
+              @click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">增加记录</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -391,6 +391,7 @@ export default {
  },
  created() {
    this.init()
+    this.fetchTableData1()
  },
  methods: {
    // 初始化条件
@@ -466,7 +467,7 @@ export default {
          sums[index] = this.taxRate * 100 + '% (税率)'
          return
        } else if (index === 9) {
-          sums[index] = parseFloat(sums[7]) * this.taxRate + ' 元(税额)'
+          sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 元(税额)'
          return
        } else if (index === 10) {
          sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 元(未税)'
@@ -522,7 +523,8 @@ export default {
      this.peopleid = ''
    },
    // 打开增加开票记录对话框
-    openAddInvoiceRecordingDialog() {
+    openAddInvoiceRecordingDialog(row) {
+      this.projectid = row.项目流水号
      this.addForm('form')
      this.title = '增加'
      this.dialogFormVisible1 = true
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -32,11 +32,11 @@
      <el-table
        v-loading="listLoading1"
        :data="tableData1"
-        highlight-current-row
        style="width: 100%"
        height="400"
        border
        size="mini"
+        highlight-current-row
        @row-click="fetchTableData2">
        <el-table-column align="center" label="合同编号" width="200">
          <template slot-scope="scope">
@@ -70,7 +70,7 @@
        </el-table-column>
        <el-table-column align="center" label="联系人" width="80">
          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
+            {{ scope.row.联系人 }}
          </template>
        </el-table-column>
        <el-table-column align="center" label="联系电话" width="100">
@@ -90,13 +90,13 @@
              size="mini"
              type="primary"
              icon="el-icon-circle-plus-outline"
-              @click.stop="openPerformanceBondDialog(); flag = 1">履约保证金</el-button>
+              @click.stop="openPerformanceBondDialog(scope.row); flag = 1">履约保证金</el-button>
            <el-button
              :disabled="scope.row.是否禁用增加履约保函"
              size="mini"
              type="primary"
              icon="el-icon-circle-plus-outline"
-              @click.stop="openAddInvoiceRecordingDialog(); flag = 3">履约保函</el-button>
+              @click.stop="addPerformanceGuarantee(scope.row)">履约保函</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -114,7 +114,7 @@
    <el-card>
      <template>
        <el-tabs v-model="activeName" type="card">
-          <el-tab-pane label="履约保证金" name="first">
+          <el-tab-pane :disabled="performanceBondDisabled" label="履约保证金" name="first">
            <el-table
              v-loading="listLoading2"
              :data="tableData2"
@@ -197,8 +197,25 @@
              </el-table-column>
            </el-table>
          </el-tab-pane>
-          <el-tab-pane label="履约保函" name="second">
-            履约保函
+          <el-tab-pane :disabled="performanceGuaranteeDisabled" label="履约保函" name="second">
+            <div v-show="performanceGuaranteeShow">
+              <el-button type="danger" icon="el-icon-delete" size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
+              <div style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
+                <el-upload
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :file-list="fileList"
+                  :before-upload="beforeUpload"
+                  :on-success="onSuccess"
+                  :action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ projectId"
+                  list-type="picture-card">
+                  <i class="el-icon-plus"/>
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible">
+                  <img :src="dialogImageUrl" width="100%" alt="">
+                </el-dialog>
+              </div>
+            </div>
          </el-tab-pane>
        </el-tabs>
      </template>
@@ -270,8 +287,9 @@
 </template>

 <script>
+import request from '@/utils/request'
 import elInput from 'element-ui/packages/input'
-import { initProject, searchTableData1, typeOfPerformanceBond, searchTableData2, takeBack, executionProgressID, initType, addPerformanceBond, editPerformanceBond, delPerformanceBond } from '@/api/MarketingCenter/PerformanceBond'
+import { initProject, searchTableData1, typeOfPerformanceBond, searchTableData2, takeBack, executionProgressID, initType, addPerformanceBond, editPerformanceBond, delPerformanceBond, addPerformanceGuarantee, delPerformanceGuarantee } from '@/api/MarketingCenter/PerformanceBond'
 export default {
  components: {
    elInput
@@ -305,6 +323,12 @@ export default {
      dialogFormVisible1: false, // 履约保证金对话框
      plannedTime: [],
      performanceBondType: [],
+      performanceBondDisabled: true, // 履约保证金标签页是否禁用
+      performanceGuaranteeDisabled: true, // 履约保函是否禁用
+      dialogVisible: false, // 履约保函复印件
+      dialogImageUrl: '',
+      fileList: [],
+      performanceGuaranteeShow: true,
      form: {
        实际收回日期: ''
      },
@@ -329,6 +353,7 @@ export default {
  },
  created() {
    this.init()
+    this.fetchTableData1()
  },
  methods: {
    // 初始化条件
@@ -339,9 +364,21 @@ export default {
    },
    // 查询合同(项目)信息
    fetchTableData1() {
-      if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
-      if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
-      if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      if (this.entryNameValue === '' || this.entryNameValue === null) {
+        this.entryNameValue_check = 0
+      } else {
+        this.entryNameValue_check = 1
+      }
+      if (this.startTime === '' || this.startTime === null) {
+        this.startTime_check = 0
+      } else {
+        this.startTime_check = 1
+      }
+      if (this.endTime === '' || this.endTime === null) {
+        this.endTime_check = 0
+      } else {
+        this.endTime_check = 1
+      }
      this.listLoading1 = true
      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
        this.tableData2 = []
@@ -379,6 +416,8 @@ export default {
        if (data === 1) {
          this.activeName = 'first'
          this.listLoading2 = true
+          this.performanceBondDisabled = false
+          this.performanceGuaranteeDisabled = true
          searchTableData2(this.projectId).then(response => {
            this.listLoading2 = false
            const data = response.data
@@ -390,11 +429,18 @@ export default {
            }
            this.tableData2 = data
          })
-        } else if (data === 1) {
+        } else if (data === 2) {
          this.activeName = 'second'
+          this.performanceBondDisabled = true
+          this.performanceGuaranteeDisabled = false
+          this.performanceGuaranteeShow = true
+          this.getFileList()
        } else {
          this.$message.warning('未缴纳履约保证金')
          this.tableData2 = []
+          this.performanceGuaranteeShow = false
+          this.performanceBondDisabled = true
+          this.performanceGuaranteeDisabled = true
        }
      })
    },
@@ -420,6 +466,8 @@ export default {
                if (data === 1) {
                  this.activeName = 'first'
                  this.listLoading2 = true
+                  this.performanceBondDisabled = false
+                  this.performanceGuaranteeDisabled = true
                  searchTableData2(this.projectId).then(response => {
                    this.listLoading2 = false
                    const data = response.data
@@ -431,10 +479,18 @@ export default {
                    }
                    this.tableData2 = data
                  })
-                } else if (data === 1) {
+                } else if (data === 2) {
                  this.activeName = 'second'
+                  this.performanceBondDisabled = true
+                  this.performanceGuaranteeDisabled = false
+                  this.performanceGuaranteeShow = true
+                  this.getFileList()
                } else {
                  this.$message.warning('未缴纳履约保证金')
+                  this.performanceBondDisabled = true
+                  this.performanceGuaranteeDisabled = true
+                  this.tableData2 = []
+                  this.performanceGuaranteeShow = false
                }
              })
            } else {
@@ -444,10 +500,11 @@ export default {
        }
      })
    },
-    openPerformanceBondDialog() {
+    openPerformanceBondDialog(row) {
      this.addForm('form2')
      this.title1 = '增加履约保证金'
      this.dialogFormVisible1 = true
+      this.projectId = row.项目流水号
      this.tableData2 = []
    },
    callOffPerformanceBondDialog() {
@@ -469,6 +526,8 @@ export default {
                  if (data === 1) {
                    this.activeName = 'first'
                    this.listLoading2 = true
+                    this.performanceBondDisabled = false
+                    this.performanceGuaranteeDisabled = true
                    searchTableData2(this.projectId).then(response => {
                      this.listLoading2 = false
                      const data = response.data
@@ -480,10 +539,18 @@ export default {
                      }
                      this.tableData2 = data
                    })
-                  } else if (data === 1) {
+                  } else if (data === 2) {
                    this.activeName = 'second'
+                    this.performanceBondDisabled = true
+                    this.performanceGuaranteeDisabled = false
+                    this.performanceGuaranteeShow = true
+                    this.getFileList()
                  } else {
                    this.$message.warning('未缴纳履约保证金')
+                    this.performanceBondDisabled = true
+                    this.performanceGuaranteeDisabled = true
+                    this.tableData2 = []
+                    this.performanceGuaranteeShow = false
                  }
                })
              } else {
@@ -502,6 +569,8 @@ export default {
                  if (data === 1) {
                    this.activeName = 'first'
                    this.listLoading2 = true
+                    this.performanceBondDisabled = false
+                    this.performanceGuaranteeDisabled = true
                    searchTableData2(this.projectId).then(response => {
                      this.listLoading2 = false
                      const data = response.data
@@ -513,10 +582,18 @@ export default {
                      }
                      this.tableData2 = data
                    })
-                  } else if (data === 1) {
+                  } else if (data === 2) {
                    this.activeName = 'second'
+                    this.performanceBondDisabled = true
+                    this.performanceGuaranteeDisabled = false
+                    this.performanceGuaranteeShow = true
+                    this.getFileList()
                  } else {
                    this.$message.warning('未缴纳履约保证金')
+                    this.performanceBondDisabled = true
+                    this.performanceGuaranteeDisabled = true
+                    this.tableData2 = []
+                    this.performanceGuaranteeShow = false
                  }
                })
              } else {
@@ -533,6 +610,7 @@ export default {
      this.form2.保证金金额 = row.履约保证金金额
      this.form2.保证金类型 = row.保金类型
      this.form2.收回条件 = parseInt(row.执行进度流水号)
+      this.title1 = '编辑履约保证金'
    },
    delPerformanceBond(row) {
      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
@@ -562,6 +640,166 @@ export default {
          }
        })
      })
+    },
+    addPerformanceGuarantee(row) {
+      this.projectId = row.项目流水号
+      this.$confirm('是否新增履约保函', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        addPerformanceGuarantee(this.projectId).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('添加成功')
+            this.activeName = 'second'
+            this.performanceBondDisabled = true
+            this.performanceGuaranteeDisabled = false
+            this.fetchTableData1()
+            typeOfPerformanceBond(this.projectId).then(response => {
+              const data = response.data[0].履约保证金类型
+              return data
+            }).then(data => {
+              if (data === 1) {
+                this.activeName = 'first'
+                this.listLoading2 = true
+                this.performanceBondDisabled = false
+                this.performanceGuaranteeDisabled = true
+                searchTableData2(this.projectId).then(response => {
+                  this.listLoading2 = false
+                  const data = response.data
+                  for (let i = 0; i < data.length; i++) {
+                    data[i].实际收回日期 !== '' && data[i].实际收回日期 !== null ? data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8) : data[i].实际收回日期
+                    data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
+                    data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
+                    data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                  }
+                  this.tableData2 = data
+                })
+              } else if (data === 2) {
+                this.activeName = 'second'
+                this.performanceBondDisabled = true
+                this.performanceGuaranteeDisabled = false
+                this.performanceGuaranteeShow = true
+                this.getFileList()
+              } else {
+                this.$message.warning('未缴纳履约保证金')
+                this.tableData2 = []
+                this.performanceGuaranteeShow = false
+                this.performanceBondDisabled = true
+                this.performanceGuaranteeDisabled = true
+              }
+            })
+          } else {
+            this.$message.error('添加失败')
+          }
+        })
+      })
+    },
+    async getFileList() {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `select * from 合同信息管理_履约保证金_履约保函 where 是否启用 = 1 and 项目流水号 = ${this.projectId}`
+        }
+      })
+      this.fileList = data.map(item => {
+        return {
+          _id: item.履约保函流水号,
+          name: item.文件标识,
+          url: 'http://localhost:8411/webpage/img/' + item.文件标识
+        }
+      })
+    },
+    async handleRemove(file, fileList) {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '4',
+          name: `update 合同信息管理_履约保证金_履约保函 set 是否启用 = 0 where 履约保函流水号 = ${file._id}`
+        }
+      })
+      if (data[0].result === '0') {
+        this.$message.error('上传失败')
+      }
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    beforeUpload(file) {
+      const isJPG = /^image\/.*/.test(file.type)
+      const isLt4M = file.size / 1024 / 1024 < 4
+      const isInvoiceNum = !!this.projectId
+
+      if (!isJPG) {
+        this.$message.error('只能上传图片。。')
+      }
+      if (!isLt4M) {
+        this.$message.error('上传图片大小不能超过 4MB!')
+      }
+
+      return isJPG && isLt4M && isInvoiceNum
+    },
+    onSuccess(res, file, fileList) {
+      fileList = []
+      if (res[0].result === '1') {
+        this.getFileList()
+      } else {
+        this.$message.error('上传失败')
+      }
+    },
+    delPerformanceGuarantee() {
+      this.$confirm('是否删除履约保函', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delPerformanceGuarantee(this.projectId).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.fetchTableData1()
+            typeOfPerformanceBond(this.projectId).then(response => {
+              const data = response.data[0].履约保证金类型
+              return data
+            }).then(data => {
+              if (data === 1) {
+                this.activeName = 'first'
+                this.listLoading2 = true
+                this.performanceBondDisabled = false
+                this.performanceGuaranteeDisabled = true
+                searchTableData2(this.projectId).then(response => {
+                  this.listLoading2 = false
+                  const data = response.data
+                  for (let i = 0; i < data.length; i++) {
+                    data[i].实际收回日期 !== '' && data[i].实际收回日期 !== null ? data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8) : data[i].实际收回日期
+                    data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
+                    data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
+                    data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                  }
+                  this.tableData2 = data
+                })
+              } else if (data === 2) {
+                this.activeName = 'second'
+                this.performanceBondDisabled = true
+                this.performanceGuaranteeDisabled = false
+                this.performanceGuaranteeShow = true
+                this.getFileList()
+              } else {
+                this.$message.warning('未缴纳履约保证金')
+                this.tableData2 = []
+                this.performanceGuaranteeShow = false
+                this.performanceBondDisabled = true
+                this.performanceGuaranteeDisabled = true
+              }
+            })
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      })
    }
  }
 }
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -68,6 +68,12 @@
            <el-tag v-else type="info" size="small">未付款</el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="到货状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到货</el-tag>
+            <el-tag v-else type="info" size="small">未到货</el-tag>
+          </template>
+        </el-table-column>
        <el-table-column label="表单号" align="center" width="280px">
          <template slot-scope="scope">
            {{ scope.row.表单号 }}
@@ -143,9 +149,6 @@
          </template>
        </el-table-column>
        <el-table-column label="付款日期" align="center" width="240px">
-          <!--<template slot-scope="scope">-->
-          <!--{{scope.row.实际付款时间}}-->
-          <!--</template>-->
          <el-table-column label="入库" align="center" width="140px">
            <template slot-scope="scope">
              {{ scope.row.入库时间 }}
@@ -176,7 +179,7 @@
              class="el-icon-edit"
              @click="Withdrawing(scope.$index, scope.row, 'form')">扣款</el-button>
            <el-button
-              :disabled="scope.row.实际付款时间!==''"
+              :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'"
              size="mini"
              type="success"
              class="el-icon-check"
@@ -376,8 +379,6 @@ export default {
          day = '0' + day
        }
        this.实际付款时间 = time.getFullYear() + '/' + month + '/' + day
-        // payment(row.外协加工任务单流水号).then(response => {
-        // }).then(() => {
        payTime(row.外协加工任务单流水号, this.实际付款时间).then(response => {
          if (response.data[0].result === '1') {
            this.$message.success('付款成功')
@@ -386,7 +387,6 @@ export default {
            this.$message.error('付款失败')
          }
        })
-        // })
      }).catch(() => {
        this.$message({
          type: 'info',
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -20,18 +20,18 @@

    <el-card>
      <el-table v-loading="loading2" :data="List" highlight-current-row height="350" border @row-click="searchProcess" >
-        <el-table-column label="付款状态" width="100" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small" style="margin: 0px">已付款</el-tag>
-            <el-tag v-else type="info" size="small" style="margin: 0px">未付款</el-tag>
-          </template>
-        </el-table-column>
        <el-table-column label="收货状态" width="100" align="center">
          <template slot-scope="scope">
            <el-tag v-if="scope.row.单据状态==='作废'" type="success" size="small" style="margin: 0px">已收货</el-tag>
            <el-tag v-else type="info" size="small" style="margin: 0px">未收货</el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="付款状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small" style="margin: 0px">已付款</el-tag>
+            <el-tag v-else type="info" size="small" style="margin: 0px">未付款</el-tag>
+          </template>
+        </el-table-column>
        <el-table-column label="表单号" align="center" min-width="200px">
          <template slot-scope="scope">
            {{ scope.row.表单号 }}
--- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
+++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
@@ -25,19 +25,19 @@
            {{ scope.row.项目名称 }}
          </template>
        </el-table-column>
-        <el-table-column label="物料名称" align="center" min-width="100">
+        <el-table-column label="图号" align="center" min-width="100">
          <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="100">
          <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="100">
          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
+            {{ scope.row.规格 }}
          </template>
        </el-table-column>
        <el-table-column label="数量" align="center" min-width="100">
@@ -50,9 +50,14 @@
            {{ scope.row.单价 }}
          </template>
        </el-table-column>
-        <el-table-column label="小计(元)" align="center" min-width="100" prop="金额">
+        <el-table-column label="优惠后单价" align="center" min-width="100">
          <template slot-scope="scope">
-            {{ scope.row.金额 }}
+            {{ scope.row.优惠后单价 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠后小计(元)" align="center" min-width="100" prop="金额">
+          <template slot-scope="scope">
+            {{ scope.row.金额 = Number(scope.row.优惠后单价) * Number(scope.row.数量) }}
          </template>
        </el-table-column>
      </el-table>
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -142,6 +142,11 @@
                {{ scope.row.物料计划到货时间.split(' ')[0] }}
              </template>
            </el-table-column>
+            <el-table-column align="center" label="生产分配时间" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.操作日期.split(' ')[0] }}
+              </template>
+            </el-table-column>
            <el-table-column :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="buyer">
              <template slot-scope="scope">
                {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
@@ -266,6 +271,11 @@
                {{ scope.row.物料计划到货时间.split(' ')[0] }}
              </template>
            </el-table-column>
+            <el-table-column align="center" label="生产分配时间" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.操作日期.split(' ')[0] }}
+              </template>
+            </el-table-column>
            <el-table-column :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="buyer">
              <template slot-scope="scope">
                {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
@@ -398,6 +408,7 @@ export default {
      this.materialName ? this.check4 = 1 : this.check4 = 0
      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1]).then(response => {
        this.tableData1 = response.data.rows
+        console.log(response.data.rows)
        this.total1 = response.data.total
      })
    },