|
|
@@ -12,6 +12,7 @@
|
|
|
:columns="newColumns"
|
|
|
:datasource="datasource"
|
|
|
cache-key="workOrderTable"
|
|
|
+ row-key="code"
|
|
|
@sort-change="onSortChange"
|
|
|
height="calc(100vh - 380px)"
|
|
|
autoAmendPage
|
|
|
@@ -60,7 +61,7 @@
|
|
|
<el-link
|
|
|
type="primary"
|
|
|
:underline="false"
|
|
|
- @click="toUnpack(row)"
|
|
|
+ @click="toUnpack(row)"
|
|
|
v-if="
|
|
|
(clientEnvironmentId != '4' && row.status == 8) ||
|
|
|
(clientEnvironmentId == '4' &&
|
|
|
@@ -77,10 +78,11 @@
|
|
|
icon="el-icon-truck"
|
|
|
@click="toRelease(row)"
|
|
|
v-if="
|
|
|
+ row.isSplit != 1 &&
|
|
|
(clientEnvironmentId != '4' && row.status == 8) ||
|
|
|
(clientEnvironmentId == '4' &&
|
|
|
!row.productName.includes('板材') &&
|
|
|
- row.status == 8)
|
|
|
+ row.status == 8)
|
|
|
"
|
|
|
>
|
|
|
派单
|
|
|
@@ -180,7 +182,6 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<unpackDialog ref="unpackRef" @success="createSuccess" />
|
|
|
-
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -277,7 +278,7 @@
|
|
|
slot: 'code',
|
|
|
label: '生产订单号',
|
|
|
align: 'center',
|
|
|
- minWidth: 150,
|
|
|
+ minWidth: 210,
|
|
|
sortable: true
|
|
|
},
|
|
|
{
|
|
|
@@ -436,21 +437,19 @@
|
|
|
});
|
|
|
},
|
|
|
|
|
|
+ /* 数据转为树形结构 */
|
|
|
+ parseData(data) {
|
|
|
+ return {
|
|
|
+ ...data,
|
|
|
+ list: this.$util.toTreeData({
|
|
|
+ data: data.list,
|
|
|
+ count: data.total,
|
|
|
|
|
|
- /* 数据转为树形结构 */
|
|
|
- parseData(data) {
|
|
|
-
|
|
|
- return {
|
|
|
- ...data,
|
|
|
- list: this.$util.toTreeData({
|
|
|
- data: data.list,
|
|
|
- count: data.total,
|
|
|
-
|
|
|
- idField: 'code',
|
|
|
- parentIdField: 'originalCode'
|
|
|
- })
|
|
|
- };
|
|
|
- },
|
|
|
+ idField: 'code',
|
|
|
+ parentIdField: 'originalCode'
|
|
|
+ })
|
|
|
+ };
|
|
|
+ },
|
|
|
|
|
|
getFieldModel() {
|
|
|
fieldModel({ fieldModel: 't_main_category' }).then((res) => {
|
|
|
@@ -551,7 +550,7 @@
|
|
|
toUnpack(row) {
|
|
|
this.$refs.unpackRef.open(row);
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
createSuccess() {
|
|
|
this.reload();
|
|
|
},
|
ysy