|
@@ -15,6 +15,9 @@
|
|
|
<el-select v-model="tableObj1.getdataListParm.parammaps.status" style="width: 140px;" clearable placeholder="审核状态" class="filter-item">
|
|
|
<el-option v-for="item in statuesNameList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
+ <el-select v-model="tableObj1.getdataListParm.parammaps.reject" style="width: 140px;" clearable placeholder="单据状态" class="filter-item">
|
|
|
+ <el-option v-for="item in rejectList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
+ </el-select>
|
|
|
|
|
|
<el-input v-model="tableObj1.getdataListParm.parammaps.outsourcingCode" placeholder="委外申请单号" style="width: 200px;" class="filter-item" />
|
|
|
|
|
@@ -67,21 +70,27 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="单据状态" min-width="150px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.status == 0 ">正常</span>
|
|
|
- <span v-else-if="scope.row.status == 1 ">关单</span>
|
|
|
+ <span v-if="scope.row.reject == 0 ">正常</span>
|
|
|
+ <span v-if="scope.row.reject == 1 ">已关单</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="center" width="350" class-name="small-padding fixed-width" fixed="right">
|
|
|
<template slot-scope="{row}">
|
|
|
+ <div v-if="row.reject != 1">
|
|
|
<el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
|
|
|
<el-button v-if="istab2Edit && row.isAcceptance == 0" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
|
|
|
<el-button v-if="istab2Del && row.isAcceptance == 0" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
|
|
|
<el-button v-if="row.isAcceptance == 0" style="display:inline-block" type="success" size="mini" @click="form_submit(row)">提交</el-button>
|
|
|
- <el-button v-if="row.isAcceptance == 0" style="display:inline-block" type="warning" size="mini" @click="form_submit(row)">关单</el-button>
|
|
|
+ <el-button v-if="row.isAcceptance == 0" style="display:inline-block" type="warning" size="mini" @click="form_closeSubmit(row)">关单</el-button>
|
|
|
<el-button v-if="istab2Shenhe1 && row.isAcceptance == 1 && (row.flowCompeleted == 1) " style="display:inline-block" type="success" size="mini" @click="form_examine(row)">审核1</el-button>
|
|
|
<el-button v-if="istab2Shenhe2 && row.isAcceptance == 1 && (row.flowCompeleted == 2) " style="display:inline-block" type="success" size="mini" @click="form_examine2(row)">审核2</el-button>
|
|
|
<el-button v-if="istab2Shenhe3 && row.isAcceptance == 1 && (row.flowCompeleted == 4) " style="display:inline-block" type="success" size="mini" @click="form_examine3(row)">审核3</el-button>
|
|
|
- </template>
|
|
|
+ </div>
|
|
|
+ <div v-else>
|
|
|
+ <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
|
|
|
+ <el-button v-if="istab2Del" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
|
|
|
</el-table>
|
|
@@ -744,23 +753,20 @@ export default {
|
|
|
parammaps: { 'pastureId': Cookies.get('pastureid'), 'eId': Cookies.get('employeid') }
|
|
|
},
|
|
|
departNameList2: [],
|
|
|
-// TODO: 已关单状态
|
|
|
- // statuesNameList: [{ id: '0', name: '审核中' }, { id: '1', name: '已通过' }, { id: '2', name: '未通过' }],
|
|
|
+ rejectList: [{ id: '0', name: '正常' }, { id: '1', name: '已关单' }], // TODO: 已关单状态
|
|
|
statuesNameList: [{ id: '0', name: '未离厂' }, { id: '1', name: '未回厂' }, { id: '2', name: '已回厂' }, { id: '3', name: '已验收' }],
|
|
|
- iscontractList:[{id: '0', name: '有合同'},{id: '1', name: '无合同'}],
|
|
|
+ iscontractList: [{ id: '0', name: '有合同' }, {id: '1', name: '无合同' }],
|
|
|
isokDisable: false,
|
|
|
-
|
|
|
-
|
|
|
tableObj1: {
|
|
|
getdataListParm: {
|
|
|
name: 'getBigacceptanceList',
|
|
|
//请求的 page 无用参数 offset 第几页 pagecount 每页多少条
|
|
|
- page: 1, offset: 1,pagecount: 10,returntype: 'Map',
|
|
|
- parammaps: { pastureName:Cookies.get('pasturename'), acceptanceCode: '',departmentName: '',status: "",outsourcingCode: "", inputDatetime:"",startdate: "",enddate: "",iscontract:''}
|
|
|
+ page: 1, offset: 1, pagecount: 10, returntype: 'Map',
|
|
|
+ parammaps: { pastureName: Cookies.get('pasturename'), acceptanceCode: '',departmentName: '',status: "",outsourcingCode: "", inputDatetime:"",startdate: "",enddate: "",iscontract:''}
|
|
|
},
|
|
|
- tableKey: 0,listLoading: false,
|
|
|
+ tableKey: 0, listLoading: false,
|
|
|
//返回的 pageNum 第几页 pageSize 每页多少条 total 总条数
|
|
|
- pageNum:'',pageSize:'',total: 0,
|
|
|
+ pageNum: '', pageSize: '', total: 0,
|
|
|
list: [
|
|
|
|
|
|
]
|
|
@@ -2328,6 +2334,37 @@ export default {
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
+ // 关单
|
|
|
+ form_closeSubmit(row){
|
|
|
+ console.log(row,'点击关单--ss')
|
|
|
+ MessageBox.confirm('确认关单,包括委外申请单及委外验收单?', {
|
|
|
+ confirmButtonText: '确认',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ var obj = {
|
|
|
+ "name": "updateBigacceptanceReject",
|
|
|
+ "parammaps": {'reject':"1" , "acceptanceCode":row.acceptanceCode }
|
|
|
+ }
|
|
|
+ PostDataByName(obj).then(res => {
|
|
|
+ const {code} = res;
|
|
|
+ if(code == 200){
|
|
|
+ this.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: '已关单'
|
|
|
+ })
|
|
|
+ this.get_table_data1()
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
+ }).catch(() => {
|
|
|
+ this.$message({
|
|
|
+ type: 'info',
|
|
|
+ message: '已取消提交'
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
save_submit(send_data){
|
|
|
ExecDataByConfig(send_data).then(response => {
|
|
|
if (response.msg !== 'fail') {
|