Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
宋伟佳
@@ -252,7 +252,6 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
console.log(data);
|
||||
this.form.title = data.title || data.form.title
|
||||
this.form.date = data.date || data.form.date
|
||||
this.json = data || data.form
|
||||
|
||||
@@ -333,13 +333,12 @@
|
||||
this.saveLoading = true
|
||||
let _formData = new FormData()
|
||||
_formData.append('taskIds', this.taskIds)
|
||||
_formData.append('pId', this.pId)
|
||||
_formData.append('json', JSON.stringify({
|
||||
form: this.form,
|
||||
roleForm: this.roleForm,
|
||||
commentText: this.commentText,
|
||||
itemList: this.itemList,
|
||||
sarType: this.sarType
|
||||
standInData: this.sarType
|
||||
}))
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
@@ -394,14 +393,19 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.itemsNum = data.itemsNum
|
||||
this.form.itemsName = data.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1
|
||||
this.sarType = data.standInData
|
||||
console.log(data);
|
||||
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||
this.sarType = data.standInData || data.sarType
|
||||
this.json = data
|
||||
var arr = []
|
||||
arr = JSON.parse(data.itemList)
|
||||
let arr
|
||||
if (typeof(data.itemList) === 'string') {
|
||||
arr = JSON.parse(data.itemList)
|
||||
} else {
|
||||
arr = data.itemList
|
||||
}
|
||||
arr.forEach(item => {
|
||||
item.zxUserId = ''
|
||||
item.zxUserIdName = ''
|
||||
|
||||
@@ -288,6 +288,7 @@
|
||||
</el-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@@ -377,7 +378,7 @@
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
|
||||
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
|
||||
|
||||
export default {
|
||||
name: "bzjdStep3",
|
||||
@@ -488,7 +489,24 @@
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
handleSave() {},
|
||||
handleSave() {
|
||||
this.saveLoading = true
|
||||
let _formData = new FormData()
|
||||
_formData.append('taskIds', this.taskIds)
|
||||
_formData.append('json', JSON.stringify({
|
||||
form: this.form,
|
||||
roleForm: this.roleForm,
|
||||
commentText: this.commentText,
|
||||
itemList: this.itemList,
|
||||
standInData: this.sarType
|
||||
}))
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
this.$message.success('保存成功')
|
||||
}).catch(e => {
|
||||
this.saveLoading = false
|
||||
})
|
||||
},
|
||||
handleSubmit() {
|
||||
this.$refs['bzzqyjForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
@@ -558,11 +576,12 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.itemsNum = data.itemsNum
|
||||
this.form.itemsName = data.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1
|
||||
this.sarType = data.standInData
|
||||
console.log(data);
|
||||
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||
this.sarType = data.standInData || data.sarType
|
||||
this.json = data
|
||||
let itemList
|
||||
if (typeof (data.itemList) == 'string') {
|
||||
|
||||
@@ -378,11 +378,11 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.itemsNum = data.itemsNum
|
||||
this.form.itemsName = data.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1
|
||||
this.sarType = data.standInData
|
||||
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||
this.sarType = data.standInData || data.sarType
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
this.loading = false
|
||||
|
||||
@@ -378,11 +378,11 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.itemsNum = data.itemsNum
|
||||
this.form.itemsName = data.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1
|
||||
this.sarType = data.standInData
|
||||
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||
this.sarType = data.standInData || data.sarType
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
this.loading = false
|
||||
|
||||
@@ -377,11 +377,11 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.itemsNum = data.itemsNum
|
||||
this.form.itemsName = data.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1
|
||||
this.sarType = data.standInData
|
||||
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||
this.sarType = data.standInData || data.sarType
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
this.loading = false
|
||||
|
||||
@@ -30,6 +30,20 @@
|
||||
<el-radio label="1">海外标准入库</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
|
||||
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
|
||||
<el-option
|
||||
v-for="item in countryOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
|
||||
<el-option
|
||||
@@ -819,6 +833,7 @@
|
||||
children: 'children',
|
||||
label: 'model'
|
||||
},
|
||||
countryOptions:[],//国家地区
|
||||
busVppsOptions: [], // 车系体系架构
|
||||
modelOptions: [], // 模块体系架构
|
||||
standSortOptions: [], // 标准类别
|
||||
@@ -971,6 +986,8 @@
|
||||
this.zbjbdFileId = processForm.zbjbd
|
||||
this.getFormFieldList(processForm)
|
||||
console.log(processForm);
|
||||
console.log("processForm");
|
||||
|
||||
}
|
||||
}).catch(e => {
|
||||
})
|
||||
@@ -1073,6 +1090,7 @@
|
||||
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.countryOptions=res.data.COUNTRY//国家地区
|
||||
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
|
||||
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
|
||||
this.standStateOptions = res.data.WBZTCLASS // 文本状态
|
||||
|
||||
@@ -30,6 +30,20 @@
|
||||
<el-radio label="1">海外标准入库</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
|
||||
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
|
||||
<el-option
|
||||
v-for="item in countryOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
|
||||
<el-option
|
||||
@@ -792,6 +806,7 @@ export default {
|
||||
children: 'children',
|
||||
label: 'model'
|
||||
},
|
||||
countryOptions:[],//国家地区
|
||||
busVppsOptions: [], // 车系体系架构
|
||||
modelOptions: [], // 模块体系架构
|
||||
standSortOptions: [], // 标准类别
|
||||
@@ -1047,6 +1062,7 @@ export default {
|
||||
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.countryOptions=res.data.COUNTRY//国家地区
|
||||
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
|
||||
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
|
||||
this.standStateOptions = res.data.WBZTCLASS // 文本状态
|
||||
|
||||
@@ -263,7 +263,6 @@
|
||||
this.form.endTime = data.endTime
|
||||
this.form.cname = data.cname
|
||||
this.json = data
|
||||
console.log(data);
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
|
||||
@@ -317,7 +317,6 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
console.log(data);
|
||||
this.form.cid = data.cid
|
||||
this.form.endTime = data.endTime
|
||||
this.form.cname = data.cname
|
||||
|
||||
Reference in New Issue
Block a user