|
|
@@ -68,16 +68,13 @@
|
|
|
</template>
|
|
|
|
|
|
|
|
|
- <template v-slot:teamId="scope">
|
|
|
- <el-form-item v-if="formingNum != 0" :prop="'surplusUnpack.' + scope.$index + '.teamId'" :rules="{
|
|
|
+ <template v-slot:classeId="scope">
|
|
|
+ <el-form-item v-if="formingNum != 0" :prop="'surplusUnpack.' + scope.$index + '.classeId'" :rules="{
|
|
|
required: true,
|
|
|
- message: '请选择班组',
|
|
|
+ message: '请选择排班',
|
|
|
trigger: 'change'
|
|
|
}">
|
|
|
- <el-select v-model="scope.row.teamId" placeholder="请选择" style="width: 100%">
|
|
|
- <el-option v-for="item in teamList" :key="item.id" :label="item.name" :value="item.id">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
+
|
|
|
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
@@ -119,16 +116,14 @@
|
|
|
</template>
|
|
|
|
|
|
|
|
|
- <template v-slot:teamId="scope">
|
|
|
- <el-form-item :prop="'unpackList.' + scope.$index + '.teamId'" :rules="[{
|
|
|
+ <template v-slot:classeId="scope">
|
|
|
+ <el-form-item :prop="'unpackList.' + scope.$index + '.classeId'" :rules="[{
|
|
|
required: true,
|
|
|
- message: '请选择班组',
|
|
|
+ message: '请选择排班',
|
|
|
trigger: 'change'
|
|
|
}]">
|
|
|
- <el-select v-model="scope.row.teamId" placeholder="请选择" style="width: 100%">
|
|
|
- <el-option v-for="item in teamList" :key="item.id" :label="item.name" :value="item.id">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
+
|
|
|
+ <el-input readonly v-model="scope.row.classeName" @click=""></el-input>
|
|
|
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
@@ -165,7 +160,7 @@
|
|
|
<script>
|
|
|
import { splitWork } from '@/api/produceOrder/index.js';
|
|
|
|
|
|
-import { getteampage } from '@/api/produceWord/index.js';
|
|
|
+
|
|
|
import { deepClone } from '@/utils';
|
|
|
export default {
|
|
|
components: {},
|
|
|
@@ -191,7 +186,7 @@ export default {
|
|
|
rules: {
|
|
|
|
|
|
},
|
|
|
- teamList: [],
|
|
|
+
|
|
|
|
|
|
|
|
|
columns: [
|
|
|
@@ -216,10 +211,10 @@ export default {
|
|
|
minWidth: 200
|
|
|
},
|
|
|
{
|
|
|
- prop: 'teamId',
|
|
|
- label: '班组',
|
|
|
+ prop: 'classeId',
|
|
|
+ label: '排班',
|
|
|
align: 'center',
|
|
|
- slot: 'teamId',
|
|
|
+ slot: 'classeId',
|
|
|
minWidth: 200
|
|
|
},
|
|
|
],
|
|
|
@@ -247,10 +242,10 @@ export default {
|
|
|
minWidth: 200
|
|
|
},
|
|
|
{
|
|
|
- prop: 'teamId',
|
|
|
- label: '班组',
|
|
|
+ prop: 'classeId',
|
|
|
+ label: '排班',
|
|
|
align: 'center',
|
|
|
- slot: 'teamId',
|
|
|
+ slot: 'classeId',
|
|
|
minWidth: 200
|
|
|
}, {
|
|
|
columnKey: 'action',
|
|
|
@@ -279,16 +274,16 @@ export default {
|
|
|
this.form.unpackList = []
|
|
|
this.setSurplus()
|
|
|
|
|
|
- this.getteampage()
|
|
|
+
|
|
|
|
|
|
},
|
|
|
|
|
|
setSurplus() {
|
|
|
- this.form.surplusUnpack.push({ originalCode: this.formData.code, formingNum: this.formData.formingNum, planStartTime: '', teamId: '' })
|
|
|
+ this.form.surplusUnpack.push({ originalCode: this.formData.code, formingNum: this.formData.formingNum, planStartTime: '', classeId: '' })
|
|
|
},
|
|
|
|
|
|
openUnpack() {
|
|
|
- this.form.unpackList.push({ originalCode: this.formData.code, formingNum: '', planStartTime: '', teamId: '' })
|
|
|
+ this.form.unpackList.push({ originalCode: this.formData.code, formingNum: '', planStartTime: '', classeId: '' })
|
|
|
},
|
|
|
|
|
|
changeNum(index) {
|
|
|
@@ -323,12 +318,6 @@ export default {
|
|
|
},
|
|
|
|
|
|
|
|
|
- getteampage() {
|
|
|
- getteampage().then((res) => {
|
|
|
- this.teamList = res.list;
|
|
|
- });
|
|
|
- },
|
|
|
-
|
|
|
|
|
|
|
|
|
cancel() {
|
|
|
@@ -361,6 +350,8 @@ export default {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ console.log(params)
|
|
|
+ return false
|
|
|
|
|
|
const res = await splitWork(params);
|
|
|
if (res) {
|