|
|
@@ -57,7 +57,7 @@
|
|
|
<el-option
|
|
|
v-for="item of nameObj.itemtype.arr"
|
|
|
:key="item.id"
|
|
|
- :value="item.id"
|
|
|
+ :value="item.name"
|
|
|
:label="item.name"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
@@ -225,7 +225,11 @@
|
|
|
label="地点"
|
|
|
width="100px"
|
|
|
:show-overflow-tooltip="true"
|
|
|
- ></el-table-column>
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ nameObj.process.obj[scope.row.process] ? nameObj.process.obj[scope.row.process] : scope.row.process }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="id"
|
|
|
label="ID"
|
|
|
@@ -346,7 +350,7 @@
|
|
|
<el-option
|
|
|
v-for="item of nameObj.process.arr"
|
|
|
:key="item.id"
|
|
|
- :value="item.name"
|
|
|
+ :value="item.id"
|
|
|
:label="item.name"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
@@ -450,9 +454,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="日期" prop="yearmonth">
|
|
|
+ <el-form-item label="日期" prop="dates">
|
|
|
<el-date-picker
|
|
|
- v-model="dialog.editorBox.form.data.yearmonth"
|
|
|
+ v-model="dialog.editorBox.form.data.dates"
|
|
|
type="date"
|
|
|
:disabled="none"
|
|
|
placeholder="选择日期"
|
|
|
@@ -799,6 +803,7 @@ export default {
|
|
|
data: {
|
|
|
process: "", //工序
|
|
|
yearmonth: "", //日期
|
|
|
+ dates: "",
|
|
|
weight: "",
|
|
|
memo: "", //备注
|
|
|
type: "", //类型
|
|
|
@@ -1155,7 +1160,7 @@ export default {
|
|
|
dates: that.filterForm.data.yearmonth[0],
|
|
|
dates2: that.filterForm.data.yearmonth[1],
|
|
|
type: that.filterForm.data.type.toString(),
|
|
|
- process: that.filterForm.data.process,
|
|
|
+ process: that.filterForm.data.process.toString()
|
|
|
};
|
|
|
for (let key in pData) {
|
|
|
if (pData[key]) {
|
|
|
@@ -1171,7 +1176,7 @@ export default {
|
|
|
that.pageSize;
|
|
|
that.axios
|
|
|
.get(url, {
|
|
|
- params: params,
|
|
|
+ params: params
|
|
|
})
|
|
|
.then(function (res) {
|
|
|
if (res.code === "0") {
|
