|
@@ -82,9 +82,9 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="goodsName" label="仓库编号" width="80">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="grade" label="r" width="80">
|
|
|
+ <el-table-column prop="grade" label="容量(吨)" width="80">
|
|
|
<!-- <template slot-scope="scope"> -->
|
|
|
- <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
|
|
|
+ <!-- <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
|
|
|
scope.row.grade
|
|
|
}}</span>
|
|
|
<span v-if="scope.row.grade == '二等品'" class="second-class">{{
|
|
@@ -95,93 +95,16 @@
|
|
|
}}</span>
|
|
|
<span v-if="scope.row.grade == '等外'" class="substandard">{{
|
|
|
scope.row.grade
|
|
|
- }}</span>
|
|
|
+ }}</span> -->
|
|
|
<!-- </template> -->
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="weight" label="重量(吨)"> </el-table-column>
|
|
|
- <el-table-column prop="unitContractPrice" label="合同单价(元)">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
|
|
|
- <el-table-column prop="buyer" label="买方"> </el-table-column>
|
|
|
- <el-table-column prop="seller" label="卖方"> </el-table-column>
|
|
|
- <el-table-column prop="imperfectGrain" label="已完成(吨)">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span style="color: #5473e8; font-weight: 600">{{
|
|
|
- scope.row.imperfectGrain
|
|
|
- }}</span>
|
|
|
- </template>
|
|
|
+ <el-table-column prop="weight" label="入库量(吨)">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="status" label="状态">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-popover
|
|
|
- placement="left"
|
|
|
- :width="285"
|
|
|
- trigger="click"
|
|
|
- visible-arrow="false"
|
|
|
- @show="history(scope.row)"
|
|
|
- >
|
|
|
- <template>
|
|
|
- <span slot="reference">
|
|
|
- <span
|
|
|
- v-if="scope.row.status == '待执行'"
|
|
|
- class="executory"
|
|
|
- ></span>
|
|
|
- <span
|
|
|
- v-if="scope.row.status == '执行中'"
|
|
|
- class="inExecution"
|
|
|
- ></span>
|
|
|
- <span v-if="scope.row.status == '已完成'" class="done"></span
|
|
|
- >{{ scope.row.status }}
|
|
|
- </span>
|
|
|
- </template>
|
|
|
- <div>
|
|
|
- <p style="margin-top: 0; padding-left: 10px">操作历史</p>
|
|
|
- <div v-for="(item, index) in historyList" class="flex">
|
|
|
- <div class="vertical-text vertical-text-left">
|
|
|
- {{ item.updateDate }}
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <div class="vertical-circle"></div>
|
|
|
- <div
|
|
|
- v-if="index != historyList.length - 1"
|
|
|
- class="vertical-line"
|
|
|
- ></div>
|
|
|
- </div>
|
|
|
- <div class="vertical-text">
|
|
|
- {{ item.operateUser }}<br />{{ item.dealMsg }}
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </el-popover>
|
|
|
- <img
|
|
|
- width="17"
|
|
|
- height="18"
|
|
|
- style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
- src="../../../public/img/edit.png"
|
|
|
- @click="editClick(scope.row)"
|
|
|
- alt=""
|
|
|
- />
|
|
|
- <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
|
|
|
- </template>
|
|
|
+ <el-table-column prop="unitContractPrice" label="出库量(吨)">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
|
|
|
- <el-table-column prop="mildewGrain" label="已付款(元)">
|
|
|
+ <el-table-column prop="packingMethod" label="应余量">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="addressUrl" label="附件">
|
|
|
- <template slot-scope="scope">
|
|
|
- <img
|
|
|
- width="18"
|
|
|
- height="20"
|
|
|
- style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
- src="../../../public/img/fujian.png"
|
|
|
- @click="fujian(scope.row)"
|
|
|
- alt=""
|
|
|
- />
|
|
|
- <span v-if="scope.row.addressUrlArray.length > 0">{{
|
|
|
- scope.row.addressUrlArray.length
|
|
|
- }}</span>
|
|
|
- <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
|
|
|
- </template>
|
|
|
+ <el-table-column prop="buyer" label="出入库">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="address" label="操作" width="200">
|
|
|
<template slot-scope="scope">
|
|
@@ -253,7 +176,7 @@ import {
|
|
|
export1,
|
|
|
editstatus,
|
|
|
billoperatehis,
|
|
|
- deletecontract,
|
|
|
+
|
|
|
} from '@/model/contarct/index'
|
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
|
import Pagination from '@/components/Pagination'
|
|
@@ -282,7 +205,7 @@ export default {
|
|
|
monetaryKey: null,
|
|
|
// 表格显示数据
|
|
|
tableDate: [],
|
|
|
- size: 10,
|
|
|
+
|
|
|
// 是否显示
|
|
|
showType: true,
|
|
|
// 年
|
|
@@ -302,7 +225,7 @@ export default {
|
|
|
contractForm: {},
|
|
|
categoryIndex: 0,
|
|
|
rulesVendor: {},
|
|
|
- deptBudgetTotal: 0,
|
|
|
+
|
|
|
size: 10,
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
handleCurrentChange:{},
|
|
@@ -314,7 +237,7 @@ export default {
|
|
|
contractList: [],
|
|
|
deptBudgetList: {},
|
|
|
historyList: [],
|
|
|
- compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
+
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
|
return time.getTime() > Date.now()
|