|
@@ -28,23 +28,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="物料" prop="productId">
|
|
|
- <el-select
|
|
|
- v-model="dataForm.productId"
|
|
|
- :disabled="display || isEdit"
|
|
|
- remote
|
|
|
- filterable
|
|
|
- placeholder="请选择"
|
|
|
- style="width:100%"
|
|
|
- @change="productIdChangeHandle"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in optionLevel"
|
|
|
- :key="item.productId"
|
|
|
- :label="item.productNameStr"
|
|
|
- :value="item.productId"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
+ <craft-product-component :disabled="display || isEdit" v-model="dataForm.productId" :product-id.sync="dataForm.productId" @productSelected="prodSelected"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -103,14 +87,15 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { getInfo, getProduct, getWorkType } from '@/api/crafts'
|
|
|
+import { getInfo, getWorkType } from '@/api/crafts'
|
|
|
import UploadComponent from '../common/upload-component'
|
|
|
import WorkFlow from '@/components/work-flow/home'
|
|
|
// import data from "@/components/work-flow/config/data.json";
|
|
|
import { GenNonDuplicateID } from '@/components/work-flow/until'
|
|
|
+import CraftProductComponent from '@/views/modules/common/craft-product-component'
|
|
|
export default {
|
|
|
name: 'add-or-update',
|
|
|
- components: { UploadComponent, WorkFlow },
|
|
|
+ components: { CraftProductComponent, UploadComponent, WorkFlow },
|
|
|
computed: {
|
|
|
orgId: {
|
|
|
get () {
|
|
@@ -203,14 +188,6 @@ export default {
|
|
|
this.isEdit = isEdit && !isCopy
|
|
|
this.isCopy = isCopy
|
|
|
|
|
|
- await getProduct({ current: 1, size: 50 }).then(({ data }) => {
|
|
|
- if (data && data.code === '200') {
|
|
|
- this.optionLevel = data.data.records
|
|
|
- this.optionLevel.forEach(item => {
|
|
|
- item.productNameStr = item.productName + '-' + item.mapNumber + '-' + (item.techId && item.techId !== 0 ? '有' : '无')
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
if (!id) return
|
|
|
await getInfo(id).then(async ({ data }) => {
|
|
|
if (data && data.code === '200') {
|
|
@@ -377,9 +354,13 @@ export default {
|
|
|
await getWorkType().then(({ data }) => {
|
|
|
if (data && data.code === '200') {
|
|
|
this.workTypeOptions = data.data
|
|
|
- console.log(data.data)
|
|
|
+ // console.log(data.data)
|
|
|
}
|
|
|
})
|
|
|
+ },
|
|
|
+ prodSelected (item) {
|
|
|
+ console.log(JSON.stringify(item))
|
|
|
+ this.dataForm.productId = item.value
|
|
|
}
|
|
|
}
|
|
|
}
|