|
@@ -6,10 +6,8 @@
|
|
|
</div>
|
|
|
<el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
<el-tab-pane label="备件出库" name="first">
|
|
|
- <!-- <div class="el-icon-info" style="font-size: 30px;float: right;color: #009C69;" @click="handleDescription" /> -->
|
|
|
<div class="el-icon-info" style="font-size: 30px;float: right;color: #409EFF;" @click="handleDescription" />
|
|
|
<div class="filter-container">
|
|
|
- <!-- @change="changePastureName" -->
|
|
|
<el-select v-model="getdataListParm.parammaps.pastureArr" style="width: 220px;" placeholder="牧场" class="filter-item" multiple
|
|
|
collapse-tags collapse-tags-tooltip >
|
|
|
<el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
|
|
@@ -21,9 +19,6 @@
|
|
|
<el-select v-model="getdataListParm.parammaps.departmentId" style="width: 140px;" placeholder="领用部门" class="filter-item" clearable>
|
|
|
<el-option v-for="item in findAllDepart" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
- <!-- <el-select v-model="getdataListParm.parammaps.easStatus" style="width: 150px;" clearable placeholder="EAS同步状态" class="filter-item">
|
|
|
- <el-option v-for="item in easStatus.easStatusList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
- </el-select> -->
|
|
|
<el-select v-model="getdataListParm.parammaps.sapStatus" style="width: 150px;" clearable placeholder="SAP上传状态" class="filter-item">
|
|
|
<el-option v-for="item in easStatus.sapStatusList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
@@ -143,7 +138,8 @@
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="出库记录" name="second">
|
|
|
<div class="filter-container">
|
|
|
- <el-select v-model="getdataListParm2.parammaps.pastureName" style="width: 140px;" placeholder="牧场" class="filter-item">
|
|
|
+ <el-select v-model="getdataListParm2.parammaps.pastureArr" multiple
|
|
|
+ collapse-tags collapse-tags-tooltip style="width: 220px;" placeholder="牧场" class="filter-item">
|
|
|
<el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
<el-input v-model="getdataListParm2.parammaps.useForm" placeholder="出库单号" style="width: 200px;" class="filter-item" />
|
|
@@ -1125,6 +1121,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
numList: [], // 青贮出库订单号
|
|
|
+ parueidIndex: '', // 当前赛场的id
|
|
|
myHeight: document.documentElement.clientHeight - 85 - 250,
|
|
|
isSap: 1,
|
|
|
isSrm: 1,
|
|
@@ -1259,7 +1256,8 @@ export default {
|
|
|
useForm: '',
|
|
|
useType: '',
|
|
|
easStatus: '',
|
|
|
- sapStatus: ''
|
|
|
+ sapStatus: '',
|
|
|
+ pastureArr:[],
|
|
|
}
|
|
|
},
|
|
|
list: [],
|
|
@@ -1285,7 +1283,8 @@ export default {
|
|
|
providerId: '',
|
|
|
pastureName: Cookies.get('pasturename'),
|
|
|
assetCode: '',
|
|
|
- eqName: ''
|
|
|
+ eqName: '',
|
|
|
+ pastureArr:[],
|
|
|
}
|
|
|
},
|
|
|
requestParam: {
|
|
@@ -1473,15 +1472,14 @@ export default {
|
|
|
})
|
|
|
this.get_select_list()
|
|
|
this.getTypeList()
|
|
|
- // 获取订单号
|
|
|
- this.getNumberArr()
|
|
|
+
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
// 获取订单号数据
|
|
|
- async getNumberArr() {
|
|
|
+ async getNumberArr(id) {
|
|
|
const params = {
|
|
|
- pastureId: Cookies.get('pastureid')
|
|
|
+ pastureId: id
|
|
|
}
|
|
|
const data = await getNumList(params)
|
|
|
this.numList = data.data
|
|
@@ -1691,6 +1689,10 @@ export default {
|
|
|
})
|
|
|
this.get_table_data()
|
|
|
this.getDepartDownList()
|
|
|
+
|
|
|
+ this.parueidIndex = response.data.findAllMainPasture.list[0].id || Cookies.get('pastureid')
|
|
|
+ // 获取订单号
|
|
|
+ this.getNumberArr(this.parueidIndex)
|
|
|
})
|
|
|
},
|
|
|
getDepartDownList() {
|
|
@@ -1721,8 +1723,21 @@ export default {
|
|
|
},
|
|
|
changePasture(item) {
|
|
|
this.getDepartParam.parammaps.pastureId = item
|
|
|
+ this.requestUseForm.parammaps.pastureId = item
|
|
|
this.edit = 1
|
|
|
this.getCreateDepartDownList()
|
|
|
+ const arr = [
|
|
|
+ { name: 'findAllEmploye', offset: 0, pagecount: 0, parammaps: { 'pastureId': item } },
|
|
|
+ // { name: 'findAllDepart', offset: 0, pagecount: 0, parammaps: { 'pastureId': item }},
|
|
|
+ ]
|
|
|
+ GetDataByNames(arr).then(response => {
|
|
|
+ console.log('下拉框数据', response.data)
|
|
|
+ this.findAllEmploye = response.data.findAllEmploye.list
|
|
|
+ // this.findAllDepart = response.data.findAllDepart.list
|
|
|
+ })
|
|
|
+ // 获取订单号
|
|
|
+ this.getNumberArr(item)
|
|
|
+ this.getNumber()
|
|
|
},
|
|
|
changeDepart(item) {
|
|
|
this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
|
|
@@ -1792,7 +1807,7 @@ export default {
|
|
|
console.log(arr2,ids2,'999999')
|
|
|
this.getdataListParm2.parammaps.pastureId = ids2.toString();
|
|
|
}
|
|
|
-
|
|
|
+ this.getdataListParm2.parammaps.departmentId = this.getdataListParm2.parammaps.departmentId.toString();
|
|
|
GetDataByName(this.getdataListParm2).then(response => {
|
|
|
this.list2 = response.data.list
|
|
|
this.pageNum2 = response.data.pageNum
|
|
@@ -1947,6 +1962,7 @@ export default {
|
|
|
})
|
|
|
this.getCreateNumber()
|
|
|
},
|
|
|
+
|
|
|
getCreateNumber() {
|
|
|
GetDataByName(this.getParmCreateNumber).then(response => {
|
|
|
this.$nextTick(() => {
|