|
|
@@ -37,6 +37,7 @@
|
|
|
</div>
|
|
|
<div class="operation" ref="operation">
|
|
|
<el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
|
|
|
+ <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleGetSapCode">获取SAP编码</el-button>
|
|
|
<el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
|
|
|
<el-button class="success" icon="el-icon-receiving" @click="handleFeedBank">饲料库</el-button>
|
|
|
<el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" class="success" @click="handleChangeOrder">更改顺序</el-button>
|
|
|
@@ -79,92 +80,31 @@
|
|
|
>
|
|
|
<u-table-column type="selection" align="center" width="50" fixed="left" />
|
|
|
<u-table-column label="序号" type="index" align="center" width="50" fixed="left"/>
|
|
|
- <u-table-column label="饲料名称" min-width="80px" align="center" fixed="left">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.fname }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="饲料分类" min-width="80px" align="center" fixed="left">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.fclass }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="唯一编码" min-width="80px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.feedcode }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="饲料来源" min-width="80px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.source }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="计划类型" min-width="90px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.printgroup }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column v-if="isInforvalue" label="小料秤" min-width="90px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.smtmrname }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="允许误差数（kg）" min-width="85px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.allowratio }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="包装单位重量(kg)" min-width="80px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.unitweight }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="单价" min-width="50px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.uprice }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="跳转重量域(kg)" min-width="90px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.autozone }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="跳转延时" min-width="80px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.autosecondname }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="确认开始" min-width="80px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.confirmstartname }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="继电器位置" min-width="60px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.trgaddress }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
+ <u-table-column label="饲料名称" min-width="80px" align="center" prop="fclass" fixed="left"/>
|
|
|
+ <u-table-column label="饲料分类" min-width="80px" align="center" prop="fclass" fixed="left"/>
|
|
|
+ <u-table-column label="物料类型" min-width="90px" align="center" prop="materialtyp" />
|
|
|
+ <u-table-column label="SAP货位" min-width="90px" align="center" prop="goods" />
|
|
|
+ <u-table-column label="唯一编码" min-width="80px" align="center" prop="feedcode" />
|
|
|
+ <u-table-column label="SAP编码" min-width="90px" align="center" prop="sapcode" />
|
|
|
+ <u-table-column label="饲料来源" min-width="80px" align="center" prop="source" />
|
|
|
+ <u-table-column label="计划类型" min-width="80px" align="center" prop="printgroup" />
|
|
|
+ <u-table-column v-if="isInforvalue" label="小料秤" min-width="90px" align="center" prop="smtmrname" />
|
|
|
+ <u-table-column label="允许误差数(kg)" min-width="80px" align="center" prop="allowratio" />
|
|
|
+ <u-table-column label="包装单位重量(kg)" min-width="80px" align="center" prop="unitweight" />
|
|
|
+ <u-table-column label="单价" min-width="80px" align="center" prop="uprice" />
|
|
|
+ <u-table-column label="跳转重量域(kg)" min-width="80px" align="center" prop="autozone" />
|
|
|
+ <u-table-column label="跳转延时" min-width="80px" align="center" prop="autosecondname" />
|
|
|
+ <u-table-column label="确认开始" min-width="80px" align="center" prop="confirmstartname" />
|
|
|
+ <u-table-column label="继电器位置" min-width="80px" align="center" prop="trgaddress" />
|
|
|
<u-table-column label="无上域" min-width="60px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.jmp == 0">否</span>
|
|
|
<span v-else>是</span>
|
|
|
</template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="备用字段01" min-width="90px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.backup1 }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="备用字段02" min-width="90px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.backup2 }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
- <u-table-column label="备用字段03" min-width="90px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.backup3 }}</span>
|
|
|
- </template>
|
|
|
- </u-table-column>
|
|
|
+ </u-table-column>
|
|
|
+ <u-table-column label="备用字段01" min-width="90px" align="center" prop="backup1" />
|
|
|
+ <u-table-column label="备用字段02" min-width="90px" align="center" prop="backup2" />
|
|
|
+ <u-table-column label="备用字段03" min-width="90px" align="center" prop="backup3" />
|
|
|
<u-table-column label="是否启用" min-width="80px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<el-switch v-model="scope.row.enable" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
|
|
|
@@ -251,6 +191,29 @@
|
|
|
<el-input ref="uprice" v-model="create.temp.uprice" class="filter-item" placeholder="最多俩位小数" type="number" step="0.01" style="width: 100%;" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="物料类型：" prop="materialtype">
|
|
|
+ <el-select v-model="create.temp.materialtype" filterable placeholder="物料类型" class="filter-item" style="width: 100%;">
|
|
|
+ <el-option v-for="item in materialtypeList" :key="item.id" :label="item.mixname" :value="item.id" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="SAP货位：" prop="goods">
|
|
|
+ <el-select v-model="create.temp.goods" filterable placeholder="SAP货位" class="filter-item" style="width: 100%;">
|
|
|
+ <el-option v-for="item in sapGoodsList" :key="item.id" :label="item.mixname" :value="item.id" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="SAP编码：" prop="sapcode">
|
|
|
+ <el-select v-model="create.temp.sapcode" filterable placeholder="SAP编码" class="filter-item" style="width: 100%;">
|
|
|
+ <el-option v-for="item in sapCodeList" :key="item.id" :label="item.mixname" :value="item.id" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
@@ -693,6 +656,60 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <!-- 获取SAP编码 -->
|
|
|
+ <el-dialog :fullscreen="dialogFull" :visible.sync="sapCode.dialogFormVisible" :close-on-click-modal="false" width="90%">
|
|
|
+ <template slot="title">
|
|
|
+ <div class="avue-crud__dialog__header">
|
|
|
+ <span class="el-dialog__title">
|
|
|
+ <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
|
|
|
+ {{ textMap[sapCode.dialogStatus] }}
|
|
|
+ </span>
|
|
|
+ <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
|
|
|
+ <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
|
|
|
+ <svg-icon v-else icon-class="fullscreen" />
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ <div class="app-add">
|
|
|
+ <div class="search" ref="search">
|
|
|
+ <el-input v-model="sapCode.table.getdataListParm.parammaps.MAKTX" placeholder="原料名称" style="width: 130px;" class="filter-item" clearable />
|
|
|
+ <el-button class="successBorder" @click="handleSapCodeSearch">查询</el-button>
|
|
|
+ </div>
|
|
|
+ <div class="table">
|
|
|
+ <u-table
|
|
|
+ id="saptable"
|
|
|
+ ref="saptable"
|
|
|
+ :key="sapCode.table.tableKey"
|
|
|
+ v-loading="sapCode.table.listLoading"
|
|
|
+ element-loading-text="给我一点时间"
|
|
|
+ border
|
|
|
+ fit
|
|
|
+ highlight-current-row
|
|
|
+ style="width: 100%;"
|
|
|
+ :row-style="rowStyle"
|
|
|
+ :cell-style="cellStyle"
|
|
|
+ class="elTable table-fixed"
|
|
|
+ row-key="id"
|
|
|
+ @selection-change="handleSapCodeSelectionChange"
|
|
|
+ :max-height="myHeight"
|
|
|
+ use-virtual
|
|
|
+ @table-body-scroll="tableScroll"
|
|
|
+ :row-height="rowHeight"
|
|
|
+ >
|
|
|
+ <u-table-column type="selection" align="center" width="50"/>
|
|
|
+ <u-table-column label="物料号" min-width="80px" align="center" prop="MATNR"/>
|
|
|
+ <u-table-column label="物料类型" min-width="90px" align="center" prop="MTART" />
|
|
|
+ <u-table-column label="物料组" min-width="80px" align="center" prop="MATKL"/>
|
|
|
+ <u-table-column label="物料描述" min-width="90px" align="center" prop="MAKTX" />
|
|
|
+ <u-table-column label="最后修改日期" min-width="80px" align="center" prop="LAEDA" />
|
|
|
+ </u-table>
|
|
|
+ </div>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button class="cancelClose" @click="sapCode.dialogFormVisible = false;getList()">关闭</el-button>
|
|
|
+ <el-button v-if="sapCode.dialogStatus==='sapCode' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData()">确认</el-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
|
|
|
</template>
|
|
|
@@ -774,7 +791,10 @@ export default {
|
|
|
feedTypeList: [], // 饲料分类
|
|
|
planTypeList: [], // 计划类型
|
|
|
smallMaterialList: [], // 小料秤
|
|
|
- jmpList: [{ id: '0', name: '否' }, { id: '1', name: '是' }], // 无上域
|
|
|
+ jmpList: [{ id: '0', name: '否' }, { id: '1', name: '是' }], // 无上域
|
|
|
+ materialtypeList:[],//物料类型
|
|
|
+ sapGoodsList:[],//sap货位
|
|
|
+ sapCodeList:[],//sap编码
|
|
|
table: {
|
|
|
tableKey: 0,
|
|
|
list: [],
|
|
|
@@ -808,7 +828,7 @@ export default {
|
|
|
create: {
|
|
|
dialogFormVisible: false,
|
|
|
dialogStatus: '',
|
|
|
- temp: { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: '用户自定义', printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '',feedgroupid:'' },
|
|
|
+ temp: { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: '用户自定义', printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '',feedgroupid:'',materialtype:'',goods:'',sapcode:''},
|
|
|
rules: {
|
|
|
printgroupid :[{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
|
|
|
fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
|
|
|
@@ -868,13 +888,35 @@ export default {
|
|
|
temp: {},
|
|
|
rules: {}
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
+ sapCode:{
|
|
|
+ dialogFormVisible: false,
|
|
|
+ dialogStatus: '',
|
|
|
+ selectList:[],
|
|
|
+ table: {
|
|
|
+ tableKey: 0,
|
|
|
+ list: [],
|
|
|
+ total: 0,
|
|
|
+ listLoading: false,
|
|
|
+ getdataListParm: {
|
|
|
+ name: 'getFeedSap',
|
|
|
+ page: 1,
|
|
|
+ offset: 1,
|
|
|
+ pagecount: '',
|
|
|
+ returntype: 'Map',
|
|
|
+ parammaps: {
|
|
|
+ MAKTX:''
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
textMap: {
|
|
|
create: '新增',
|
|
|
update: '编辑',
|
|
|
feedBank: '饲料库',
|
|
|
relation: '关联',
|
|
|
- nutritive: '营养价值'
|
|
|
+ nutritive: '营养价值',
|
|
|
+ sapCode: '获取SAP编码'
|
|
|
},
|
|
|
|
|
|
isokDisable: false,
|
|
|
@@ -1770,8 +1812,35 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
-
|
|
|
+ handleGetSapCode(){
|
|
|
+ if (this.selectList.length == 0) {
|
|
|
+ this.$message({ type: 'error', message: '请选择一条信息', duration: 2000 })
|
|
|
+ } else {
|
|
|
+ this.dialogFull = false
|
|
|
+ this.sapCode.dialogStatus = 'sapCode'
|
|
|
+ this.sapCode.dialogFormVisible = true
|
|
|
+ this.sapCode.table.getdataListParm.parammaps.MAKTX = this.selectList[0].sapcode
|
|
|
+ this.getsapCodeList()
|
|
|
+ }
|
|
|
+ },
|
|
|
+ getsapCodeList(){
|
|
|
+ GetDataByName(this.sapCode.table.getdataListParm).then(response => {
|
|
|
+ if (response.data.list !== null) {
|
|
|
+ this.sapCode.table.list = response.data.list
|
|
|
+ } else {
|
|
|
+ this.sapCode.table.list = []
|
|
|
+ }
|
|
|
+ this.$refs.saptable.reloadData(this.sapCode.table.list)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ handleSapCodeSearch(){},
|
|
|
+ sapCodeData(){
|
|
|
+
|
|
|
+ },
|
|
|
+ handleSapCodeSelectionChange(val){
|
|
|
+ this.sapCode.selectList = val
|
|
|
+ console.log(this.sapCode.selectList,'this.sapCode.selectList')
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</script>
|
