|
@@ -1,46 +1,22 @@
|
|
<template>
|
|
<template>
|
|
-<!-- 开始、生产节点 -->
|
|
|
|
|
|
+ <!-- 开始、生产节点 -->
|
|
<div>
|
|
<div>
|
|
- <el-form
|
|
|
|
- :model="form"
|
|
|
|
- ref="form"
|
|
|
|
- :rules="rules"
|
|
|
|
- label-width="100px"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-form :model="form" ref="form" :rules="rules" label-width="100px">
|
|
<el-form-item label="工时单价">
|
|
<el-form-item label="工时单价">
|
|
- <el-input
|
|
|
|
- v-model="form.quotedPrice"
|
|
|
|
- placeholder="工时单价"
|
|
|
|
- :disabled="disabled"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="form.quotedPrice" placeholder="工时单价" :disabled="disabled"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="备注" prop="notes">
|
|
<el-form-item label="备注" prop="notes">
|
|
- <el-input
|
|
|
|
- v-model="form.notes"
|
|
|
|
- :disabled="disabled || selectOperator"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="form.notes" :disabled="disabled || selectOperator"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="工序要求" prop="require">
|
|
<el-form-item label="工序要求" prop="require">
|
|
- <el-input
|
|
|
|
- v-model="form.require"
|
|
|
|
- :disabled="disabled || selectOperator"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="form.require" :disabled="disabled || selectOperator"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="工序特性" prop="process">
|
|
<el-form-item label="工序特性" prop="process">
|
|
- <el-input
|
|
|
|
- v-model="form.process"
|
|
|
|
- :disabled="disabled || selectOperator"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="form.process" :disabled="disabled || selectOperator"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item
|
|
|
|
- label="所需工时"
|
|
|
|
- prop="preTaskTime"
|
|
|
|
- >
|
|
|
|
- <el-input
|
|
|
|
- v-model="form.preTaskTime"
|
|
|
|
- :disabled="disabled || selectOperator"
|
|
|
|
- oninput="value=value.replace(/[^0-9.]/g,'')"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-form-item label="所需工时" prop="preTaskTime">
|
|
|
|
+ <el-input v-model="form.preTaskTime" :disabled="disabled || selectOperator"
|
|
|
|
+ oninput="value=value.replace(/[^0-9.]/g,'')">
|
|
<i slot="suffix" style="font-style: normal; margin-right: 10px">h</i>
|
|
<i slot="suffix" style="font-style: normal; margin-right: 10px">h</i>
|
|
</el-input>
|
|
</el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -50,53 +26,25 @@
|
|
<el-radio :label="1">否</el-radio>
|
|
<el-radio :label="1">否</el-radio>
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="要求完成时间" prop="planCompletionTime" v-if="selectOperator">
|
|
|
|
- <el-date-picker
|
|
|
|
- v-model="form.planCompletionTime"
|
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
|
- type="date"
|
|
|
|
- >
|
|
|
|
- </el-date-picker>
|
|
|
|
|
|
+ <el-form-item label="要求完成时间" prop="planCompletionTime" v-if="selectOperator">
|
|
|
|
+ <el-date-picker v-model="form.planCompletionTime" value-format="yyyy-MM-dd" type="date">
|
|
|
|
+ </el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="操作人" v-if="form.operatorName && !selectOperator">
|
|
<el-form-item label="操作人" v-if="form.operatorName && !selectOperator">
|
|
- <el-input
|
|
|
|
- :disabled="disabled && selectOperator || !isEdit"
|
|
|
|
- v-model="form.operatorName"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input :disabled="disabled && selectOperator || !isEdit" v-model="form.operatorName"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item
|
|
|
|
- label="操作人"
|
|
|
|
- prop="operatorId"
|
|
|
|
- v-if="selectOperator"
|
|
|
|
- >
|
|
|
|
- <el-select
|
|
|
|
- v-model="form.operatorId"
|
|
|
|
- :disabled="disabled && selectOperator || !isEdit"
|
|
|
|
- multiple
|
|
|
|
- placeholder="请选择"
|
|
|
|
- style="width: 100%"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="item in operatorIdOptions"
|
|
|
|
- :key="item.userId"
|
|
|
|
- :label="item.name"
|
|
|
|
- :value="item.userId"
|
|
|
|
- ></el-option>
|
|
|
|
|
|
+ <el-form-item label="操作人" prop="operatorId" v-if="selectOperator">
|
|
|
|
+ <el-select v-model="form.operatorId" :disabled="disabled && selectOperator || !isEdit" multiple
|
|
|
|
+ placeholder="请选择" style="width: 100%">
|
|
|
|
+ <el-option v-for="item in operatorIdOptions" :key="item.userId" :label="item.name"
|
|
|
|
+ :value="item.userId"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="附件" prop="attachList" v-if="!disabled && !selectOperator">
|
|
<el-form-item label="附件" prop="attachList" v-if="!disabled && !selectOperator">
|
|
- <upload-component
|
|
|
|
- :accept="'*'"
|
|
|
|
- v-model="form.attachList"
|
|
|
|
- :file-obj-list="form.attachList"
|
|
|
|
- />
|
|
|
|
|
|
+ <upload-component :accept="'*'" v-model="form.attachList" :file-obj-list="form.attachList" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item v-else prop="attachList">
|
|
<el-form-item v-else prop="attachList">
|
|
- <upload-component
|
|
|
|
- :display="true"
|
|
|
|
- :accept="'*'"
|
|
|
|
- v-model="form.attachList"
|
|
|
|
- />
|
|
|
|
|
|
+ <upload-component :display="true" :accept="'*'" v-model="form.attachList" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
</div>
|
|
</div>
|
|
@@ -112,7 +60,7 @@ export default {
|
|
props: {
|
|
props: {
|
|
data: {
|
|
data: {
|
|
type: Object,
|
|
type: Object,
|
|
- default: () => {}
|
|
|
|
|
|
+ default: () => { }
|
|
},
|
|
},
|
|
disabled: {
|
|
disabled: {
|
|
type: Boolean,
|
|
type: Boolean,
|
|
@@ -128,7 +76,7 @@ export default {
|
|
default: false
|
|
default: false
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- data () {
|
|
|
|
|
|
+ data() {
|
|
return {
|
|
return {
|
|
// 工种列表
|
|
// 工种列表
|
|
workTypeOptions: [],
|
|
workTypeOptions: [],
|
|
@@ -183,7 +131,7 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
- data (val) {
|
|
|
|
|
|
+ data(val) {
|
|
console.log('node-edit-normal watch', val)
|
|
console.log('node-edit-normal watch', val)
|
|
this.node = val
|
|
this.node = val
|
|
this.form = {
|
|
this.form = {
|
|
@@ -210,19 +158,19 @@ export default {
|
|
// this.form.attachList = []
|
|
// this.form.attachList = []
|
|
// }
|
|
// }
|
|
},
|
|
},
|
|
- disabled (val) {
|
|
|
|
|
|
+ disabled(val) {
|
|
this.disabled = val
|
|
this.disabled = val
|
|
},
|
|
},
|
|
- isEdit (val) {
|
|
|
|
|
|
+ isEdit(val) {
|
|
this.isEdit = val
|
|
this.isEdit = val
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- activated () {},
|
|
|
|
- created () {
|
|
|
|
|
|
+ activated() { },
|
|
|
|
+ created() {
|
|
this.getWorkTypeOptions()
|
|
this.getWorkTypeOptions()
|
|
},
|
|
},
|
|
computed: {},
|
|
computed: {},
|
|
- mounted () {
|
|
|
|
|
|
+ mounted() {
|
|
this.node = this.data
|
|
this.node = this.data
|
|
this.form = {
|
|
this.form = {
|
|
...this.form,
|
|
...this.form,
|
|
@@ -234,18 +182,18 @@ export default {
|
|
|
|
|
|
console.log(this.form.isProgramme)
|
|
console.log(this.form.isProgramme)
|
|
|
|
|
|
- if(this.form.isProgramme == undefined || this.form.isProgramme == null){
|
|
|
|
|
|
+ if (this.form.isProgramme === undefined || this.form.isProgramme === null) {
|
|
this.form.isProgramme = 2
|
|
this.form.isProgramme = 2
|
|
}
|
|
}
|
|
|
|
|
|
console.log(this.form.isProgramme)
|
|
console.log(this.form.isProgramme)
|
|
|
|
|
|
console.log(1111)
|
|
console.log(1111)
|
|
-
|
|
|
|
|
|
+
|
|
this.getOperatorList()
|
|
this.getOperatorList()
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- getWorkTypeOptions () {
|
|
|
|
|
|
+ getWorkTypeOptions() {
|
|
this.workTypeOptions = []
|
|
this.workTypeOptions = []
|
|
getWorkType().then(({ data }) => {
|
|
getWorkType().then(({ data }) => {
|
|
if (data && data.code === '200') {
|
|
if (data && data.code === '200') {
|
|
@@ -253,7 +201,7 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- onChage (val) {
|
|
|
|
|
|
+ onChage(val) {
|
|
this.workTypeOptions.forEach((v) => {
|
|
this.workTypeOptions.forEach((v) => {
|
|
if (v.typeId === val) {
|
|
if (v.typeId === val) {
|
|
this.form.quotedPrice = Number(v.quotedPrice || 0).toFixed(2)
|
|
this.form.quotedPrice = Number(v.quotedPrice || 0).toFixed(2)
|
|
@@ -261,7 +209,7 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 按工种ID查询操作人列表
|
|
// 按工种ID查询操作人列表
|
|
- getOperatorList () {
|
|
|
|
|
|
+ getOperatorList() {
|
|
if (this.node.workTypeId) {
|
|
if (this.node.workTypeId) {
|
|
workTypeMasterList(this.node.workTypeId).then(({ data }) => {
|
|
workTypeMasterList(this.node.workTypeId).then(({ data }) => {
|
|
if (data && data.code === '200') {
|
|
if (data && data.code === '200') {
|
|
@@ -276,7 +224,7 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
// 校验表单
|
|
// 校验表单
|
|
- validateFormData () {
|
|
|
|
|
|
+ validateFormData() {
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
this.$refs['form'].validate((valid) => {
|
|
this.$refs['form'].validate((valid) => {
|
|
if (!valid) {
|
|
if (!valid) {
|
|
@@ -289,7 +237,7 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 获取表单数据
|
|
// 获取表单数据
|
|
- formData () {
|
|
|
|
|
|
+ formData() {
|
|
const form = { ...this.form, operatorName: '' }
|
|
const form = { ...this.form, operatorName: '' }
|
|
if (this.form.operatorId != null) {
|
|
if (this.form.operatorId != null) {
|
|
form.operatorId = this.form.operatorId.toString()
|
|
form.operatorId = this.form.operatorId.toString()
|