外协执行编辑已提交

src/api/Outsourcing/OutsourcingPaymentPlanManagement.js

@@ -13,51 +13,26 @@ export function searchtable(check1, ManufacturerAbbreviation, check2, starttime,
     }
   })
 }
-// 修改实际付款日期
+export function getInvoice(Number, pageCurrent, pageSize) {
-export function payTime(num, time) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据_实际付款时间',
-      param: '外协加工任务单流水号=' + num + '&实际付款时间=' + time
-    }
-  })
-}
-// 修改扣款数据、扣款说明
-export function WithdrawingEdit(num, quality, Explain) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协扣款_编辑数据',
-      param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款说明=' + Explain
-    }
-  })
-}
-// 单据状态： 1 未成交 2 成交 3 作废
-export function payment(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据_作废',
-      param: '外协加工任务单流水号=' + num + '&单据状态=3'
-    }
-  })
-}
-// 查询零件信息
-export function getParts(check, Number, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_外协发票管理_查询数据',
-      param: '外协厂家流水号_check=' + check + '&外协厂家流水号=' + Number + '=int',
+      param: '外协厂家流水号_check=1&外协厂家流水号=' + Number,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function getPayment(Number, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_外协付款记录_查询数据',
+      param: '外协厂家流水号=' + Number,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/Outsourcing/OutsourcingTaskExecution.js

@@ -12,14 +12,14 @@ export function initOutHelp() {
   })
 }
 // 初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3) {
+export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据',
+      name: '车间生产管理_外协加工任务单_查询数据_2020',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num,
+      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue

@@ -1,55 +1,149 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-row>
+      <el-col :span="8">
-        <span>外协厂家:</span>
+        <el-row>
-        <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
+          <span>外协厂家:</span>
-        <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent2=1;pageSize2=20;getParts()">查询</el-button>
+          <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
-      </el-row>
+          <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=20;getParts()">查询</el-button>
-      <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="370" style="width: 100%;" border element-loading-text="拼命加载中">
+        </el-row>
-        <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
+        <el-table v-loading="loading" :data="tableData" size="mini" stripe height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
-          <template slot-scope="scope">
+          <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
-            {{ scope.row.外协厂家名称 }}
+            <template slot-scope="scope">
-          </template>
+              {{ scope.row.外协厂家名称 }}
-        </el-table-column>
+            </template>
-        <el-table-column label="外协金额" prop="总价" align="center" width="200px">
+          </el-table-column>
-          <template slot-scope="scope">
+          <el-table-column label="外协金额" prop="总价" align="center" width="200px">
-            {{ scope.row.总价 }}
+            <template slot-scope="scope">
-          </template>
+              {{ scope.row.总价 }}
-        </el-table-column>
+            </template>
-        <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
+          </el-table-column>
-          <template slot-scope="scope">
+          <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
-            {{ parseFloat(scope.row.开票金额).toFixed(2) }}
+            <template slot-scope="scope">
-          </template>
+              {{ parseFloat(scope.row.开票金额).toFixed(2) }}
-        </el-table-column>
+            </template>
-        <el-table-column label="付款金额" align="center">
+          </el-table-column>
-          <template slot-scope="scope">
+          <el-table-column label="付款金额" align="center">
-            {{ scope.row.备注 }}
+            <template slot-scope="scope">
-          </template>
+              {{ scope.row.备注 }}
-        </el-table-column>
+            </template>
-        <el-table-column label="未付金额" align="center">
+          </el-table-column>
-          <template slot-scope="scope">
+          <el-table-column label="未付金额" align="center">
-            {{ scope.row.备注 }}
+            <template slot-scope="scope">
-          </template>
+              {{ scope.row.备注 }}
-        </el-table-column>
+            </template>
-        <el-table-column label="操作" align="center" width="200px">
+          </el-table-column>
-          <template slot-scope="scope">
+          <el-table-column label="操作" align="center" width="200px">
-            <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
+            <template slot-scope="scope">
-            <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-          </template>
+              <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
-        </el-table-column>
+            </template>
-      </el-table>
+          </el-table-column>
-      <div class="block">
+        </el-table>
-        <el-pagination
+        <div class="block">
-          v-if="!loading2"
+          <el-pagination
-          :current-page="pageCurrent2"
+            v-if="!loading"
-          :page-sizes="[20, 30, 40]"
+            :current-page="pageCurrent"
-          :page-size="pageSize2"
+            :page-sizes="[20, 30, 40]"
-          :total="total2"
+            :page-size="pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
-          @size-change="handleSizeChange2"
+            layout="total, sizes, prev, pager, next, jumper"
-          @current-change="handleCurrentChange2"/>
+            @size-change="handleSizeChange"
-      </div>
+            @current-change="handleCurrentChange"/>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="500" style="width: 100%;" border element-loading-text="拼命加载中">
+          <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
+            <template slot-scope="scope">
+              {{ scope.row.外协厂家名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="外协金额" prop="总价" align="center" width="200px">
+            <template slot-scope="scope">
+              {{ scope.row.总价 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.开票金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="付款金额" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="未付金额" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="200px">
+            <template slot-scope="scope">
+              <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
+              <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            v-if="!loading2"
+            :current-page="pageCurrent2"
+            :page-sizes="[20, 30, 40]"
+            :page-size="pageSize2"
+            :total="total2"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange2"
+            @current-change="handleCurrentChange2"/>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <el-table v-loading="loading3" :data="tableData3" size="mini" stripe height="500" style="width: 100%;" border element-loading-text="拼命加载中">
+          <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
+            <template slot-scope="scope">
+              {{ scope.row.外协厂家名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="外协金额" prop="总价" align="center" width="200px">
+            <template slot-scope="scope">
+              {{ scope.row.总价 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.开票金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="付款金额" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="未付金额" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="200px">
+            <template slot-scope="scope">
+              <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
+              <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            v-if="!loading3"
+            :current-page="pageCurrent3"
+            :page-sizes="[20, 30, 40]"
+            :page-size="pageSize3"
+            :total="total3"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange3"
+            @current-change="handleCurrentChange3"/>
+        </div>
+      </el-col>
     </el-card>
 
     <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
@@ -104,16 +198,14 @@
 </template>
 
 <script>
-import { searchtable, edittype, handlechange, handledelete } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
+import { searchtable, getInvoice, getPayment, edittype, handlechange, handledelete } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
 export default {
   data() {
     return {
       ManufacturerName: '', // 外协厂家
+      外协厂家流水号: '',
       title1: '',
       dialogFormVisible: false,
-      renwudan: '',
-      count1: 0,
-      count2: 0,
       form: {
         外协厂家: '',
         发票号: '',
@@ -124,25 +216,73 @@ export default {
         接收时间: '',
         备注: ''
       },
+      外协厂家: [],
       rules: {},
+      loading: false,
+      tableData: [], // 表格数据
+      total: null, // 总条数
+      pageSize: 20, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      loading2: false,
       tableData2: [], // 表格数据
       total2: null, // 总条数
       pageSize2: 20, // 每页显示条数
-      pageCurrent2: 1 // 后台获取页
+      pageCurrent2: 1, // 后台获取页
+      loading3: false,
+      tableData3: [], // 表格数据
+      total3: null, // 总条数
+      pageSize3: 20, // 每页显示条数
+      pageCurrent3: 1 // 后台获取页
     }
   },
   created() {
     this.getParts()
   },
   methods: {
-    // 获取表格2数据
+    // 获取表格1数据
     getParts() {
-      this.loading2 = true
+      this.loading = true
-      this.tableData2 = []
+      this.tableData = []
       var check
       var check2 = 0
       this.ManufacturerName ? check = 1 : check = 0
-      searchtable(check, this.ManufacturerName, check2, '', '', this.pageCurrent2, this.pageSize2).then(response => {
+      searchtable(check, this.ManufacturerName, check2, '', '', this.pageCurrent, this.pageSize).then(response => {
+        this.loading = false
+        if (response.data.rows.length !== 0) {
+          this.tableData = response.data.rows
+          this.total = response.data.total
+        }
+      })
+    },
+    rowClick(row) {
+      this.外协厂家流水号 = row.外协厂家流水号
+      this.loading2 = true
+      this.tableData2 = []
+      this.loading3 = true
+      this.tableData3 = []
+      getInvoice(row.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 2)
+        this.loading2 = false
+        if (response.data.rows.length !== 0) {
+          this.tableData2 = response.data.rows
+          this.total2 = response.data.total
+        }
+      })
+      getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 3)
+        this.loading3 = false
+        if (response.data.rows.length !== 0) {
+          this.tableData3 = response.data.rows
+          this.total3 = response.data.total
+        }
+      })
+    },
+    // 发票
+    getInvoice(row) {
+      this.loading2 = true
+      this.tableData2 = []
+      getInvoice(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 2)
         this.loading2 = false
         if (response.data.rows.length !== 0) {
           this.tableData2 = response.data.rows
@@ -150,14 +290,22 @@ export default {
         }
       })
     },
+    // 付款
+    getPayment(row) {
+      this.loading3 = true
+      this.tableData3 = []
+      getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 3)
+        this.loading3 = false
+        if (response.data.rows.length !== 0) {
+          this.tableData3 = response.data.rows
+          this.total3 = response.data.total
+        }
+      })
+    },
     // 点击增加
     editType1(formName) {
-      this.count1 = this.count1 + 1
-      if (this.count1 !== 1) {
-        this.$refs[formName].resetFields()
-      }
       this.title1 = '到票'
-      // this.renwudan = row.外协加工任务单流水号
       this.form.发票号 = ''
       this.form.开户行 = ''
       this.form.开票时间 = ''
@@ -186,16 +334,6 @@ export default {
     },
     // 编辑打开
     handleChange1(index, row, formName) {
-      this.count2 = this.count2 + 1
-      if (this.count2 !== 1) {
-        this.$refs[formName].resetFields()
-      }
-      if (row.开票时间 === '1900/1/1') {
-        row.开票时间 = ''
-      }
-      if (row.接收时间 === '1900/1/1') {
-        row.接收时间 = ''
-      }
       this.form.外协厂家 = row.外协厂家流水号
       this.form.发票号 = row.发票号
       this.form.开户行 = row.开户行
@@ -251,8 +389,8 @@ export default {
         type: 'warning'
       }).then(() => {
         handledelete(row.id).then(response => {
-          if (this.tableData2 && this.tableData2.length === 1 && this.pageCurrent2 > 1) {
+          if (this.tableData && this.tableData.length === 1 && this.pageCurrent > 1) {
-            this.pageCurrent2--
+            this.pageCurrent--
           }
           if (response.data[0].result === '1') {
             this.$notify({
@@ -276,21 +414,29 @@ export default {
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val
-      this.searchTable()
+      this.getParts()
     },
     handleCurrentChange(val) {
       this.pageCurrent = val
-      this.searchTable()
+      this.getParts()
     },
     handleSizeChange2(val) {
       this.pageCurrent2 = 1
       this.pageSize2 = val
-      this.getParts()
+      this.getInvoice()
     },
     handleCurrentChange2(val) {
       this.pageCurrent2 = val
-      this.tableData2 = []
+      this.getInvoice()
-      this.getParts()
+    },
+    handleSizeChange3(val) {
+      this.pageCurrent3 = 1
+      this.pageSize3 = val
+      this.getPayment()
+    },
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.getPayment()
     }
   }
 }
@@ -304,4 +450,3 @@ export default {
     background: #AEF199;
   }
 </style>
-

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -84,6 +84,7 @@
         <span>厂家:</span>
         <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()" @clear="pageSize=20;pageList=1;fetchData()"/>
         <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
+        <el-checkbox v-model="isChecked" size="small" label="编辑已提交"/>
         <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
         <el-table v-loading="loading2" :data="List" highlight-current-row height="450" size="mini" stripe border @row-click="searchProcess" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="155px">
@@ -341,6 +342,7 @@ export default {
   },
   data() {
     return {
+      isChecked: false,
       bianliang: [],
       card: false,
       费用: '',
@@ -536,7 +538,7 @@ export default {
       }
       this.List = []
       this.List3 = []
-      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize, this.documentStatus, this.num3).then(response => {
+      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize, this.documentStatus, this.num3, this.isChecked).then(response => {
         this.total = parseInt(response.data.total)
         for (let i = 0; i < response.data.rows.length; i++) {
           if (response.data.rows[i].任务下达日期 !== null) {