更新

2020-05-06 08:44:51 +08:00
parent 1df919eab0
commit b7bb7d031e
15 changed files with 357 additions and 220 deletions
--- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
@@ -29,7 +29,7 @@
    </el-card>
    <el-card style="margin-top: 5px">
      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
-        <el-table-column label="采购合同编号" align="center" width="110">
+        <el-table-column label="采购合同编号" align="center" width="120">
          <template slot-scope="scope">
            {{ scope.row.采购合同编号 }}
          </template>
@@ -94,13 +94,18 @@
            {{ scope.row.未通过审批原因 }}
          </template>
        </el-table-column>
-        <el-table-column label="操作" align="center" width="50px" fixed="right">
+        <el-table-column label="操作" align="center" width="80px" fixed="right">
          <template slot-scope="scope">
            <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
              <div style="display: inline-block">
                <el-button type="text" size="mini" @click="searchTable2(scope.row)">详情</el-button>
              </div>
            </el-tooltip>
+            <el-tooltip :open-delay="1000" effect="dark" content="撤销审核" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" @click="editSubmit(scope.row)">撤销</el-button>
+              </div>
+            </el-tooltip>
          </template>
        </el-table-column>
      </el-table>
@@ -124,7 +129,7 @@
 </template>

 <script>
-import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/ContractApprovalQuery'
+import { initBuyer, searchTable1, searchTable2, editsubmit } from '@/api/ManufacturingCenter/ContractApprovalQuery'

 export default {
  data() {
@@ -201,6 +206,31 @@ export default {
        this.dialogFormVisible = true
      })
    },
+    editSubmit(row) {
+      if (row.审批情况流水号 !== '3') {
+        this.$message.error('该合同已审批，无法撤回！')
+      } else {
+        this.$confirm('确定删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          editsubmit(row.采购合同流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('撤销成功')
+            } else {
+              this.$message.error('操作失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      }
+      this.searchTable1()
+    },
    handleSizeChange1(val) {
      this.pageCurrent1 = 1
      this.pageSize1 = val
--- a/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
@@ -9,7 +9,7 @@
          :label="item.label"
          :value="item.value"/>
      </el-select>
-      <span style="margin-left: 0">审批时间:</span>
+      <span style="margin-left: 0">提交时间:</span>
      <el-date-picker
        v-model="dateRange"
        size="small"
@@ -29,63 +29,83 @@
    </el-card>
    <el-card style="margin-top: 5px">
      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
-        <el-table-column label="采购合同编号" align="center" min-width="130">
+        <el-table-column label="采购合同编号" align="center" width="120">
          <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="150" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.供应商名称 }}
          </template>
        </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="60">
+        <el-table-column label="采购员" align="center" width="70">
          <template slot-scope="scope">
            {{ scope.row.姓名 }}
          </template>
        </el-table-column>
-        <el-table-column label="合同金额(元)" align="center" min-width="60">
+        <el-table-column label="合同金额(元)" align="center" min-width="90">
          <template slot-scope="scope">
            {{ scope.row.合同总额 }}
          </template>
        </el-table-column>
-        <el-table-column label="交货日期" align="center" min-width="60">
+        <el-table-column label="提交时间" align="center" width="90">
          <template slot-scope="scope">
-            {{ scope.row.交货日期 }}
+            {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}
          </template>
        </el-table-column>
-        <el-table-column label="审核时间" align="center" min-width="60">
+        <el-table-column label="审核人" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.审核人姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审核时间" align="center" width="90">
          <template slot-scope="scope">
            {{ scope.row.审核时间 ? scope.row.审核时间.split(' ')[0] : '' }}
          </template>
        </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="60">
+        <el-table-column label="审核结果" align="center" min-width="90">
          <template slot-scope="scope">
-            {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
+            {{ scope.row.审核情况内容 }}
          </template>
        </el-table-column>
-        <el-table-column label="审批人" align="center" min-width="60">
+        <el-table-column label="审核未过原因" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.未通过审核原因 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批人" align="center" width="90">
          <template slot-scope="scope">
            {{ scope.row.审批人姓名 }}
          </template>
        </el-table-column>
-        <el-table-column label="审批结果" align="center" min-width="60">
+        <el-table-column label="审批时间" align="center" min-width="90">
+          <template slot-scope="scope">
+            {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批结果" align="center" min-width="90">
          <template slot-scope="scope">
            {{ scope.row.审批情况内容 }}
          </template>
        </el-table-column>
-        <el-table-column label="未过原因" align="center" min-width="60">
+        <el-table-column label="审批未过原因" align="center" width="80">
          <template slot-scope="scope">
            {{ scope.row.未通过审批原因 }}
          </template>
        </el-table-column>
-        <el-table-column label="操作" align="center" width="90px" fixed="right">
+        <el-table-column label="操作" align="center" width="80px" fixed="right">
          <template slot-scope="scope">
            <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
              <div style="display: inline-block">
                <el-button type="text" size="mini" @click="searchTable2(scope.row)">详情</el-button>
              </div>
            </el-tooltip>
+            <el-tooltip :open-delay="1000" effect="dark" content="撤销审核" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" @click="editSubmit(scope.row)">撤销</el-button>
+              </div>
+            </el-tooltip>
          </template>
        </el-table-column>
      </el-table>
@@ -102,14 +122,14 @@
      </div>
    </el-card>

-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="900px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审核通知" center style="min-height: 300px;" width="900px">
      <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
    </el-dialog>
  </div>
 </template>

 <script>
-import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/ContractApprovalQuery1'
+import { initBuyer, searchTable1, searchTable2, editsubmit } from '@/api/ManufacturingCenter/ContractApprovalQuery'

 export default {
  data() {
@@ -151,6 +171,7 @@ export default {
      this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
      this.personValue ? check3 = 1 : check3 = 0
      searchTable1(this.radio, check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => {
+        console.log(response.data)
        this.loading1 = false
        this.tableData1 = response.data.rows
        this.total1 = response.data.total
@@ -175,7 +196,7 @@ export default {
      }
      param[6] = ['人员编号_check', check3]
      param[7] = ['人员编号', this.personValue]
-      var Data = this.CreateData('2001', '报表_采购管理_合同审批查询_查询数据', param)
+      var Data = this.CreateData('2001', '报表_采购管理_合同审核查询_查询数据', param)
      this.exportExcel_NPOI(Data)
    },
    searchTable2(row) {
@@ -185,6 +206,31 @@ export default {
        this.dialogFormVisible = true
      })
    },
+    editSubmit(row) {
+      if (row.审批情况流水号 !== '3') {
+        this.$message.error('该合同已审批，无法撤回！')
+      } else {
+        this.$confirm('确定撤回?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          editsubmit(row.采购合同流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('撤销成功')
+            } else {
+              this.$message.error('操作失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消撤回'
+          })
+        })
+      }
+      this.searchTable1()
+    },
    handleSizeChange1(val) {
      this.pageCurrent1 = 1
      this.pageSize1 = val