|
|
@@ -11,6 +11,7 @@
|
|
|
<i class="icon icon-table2"></i> 编辑
|
|
|
</span>
|
|
|
<span style="float: right;">
|
|
|
+ <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
|
|
|
<el-button type="primary" size="mini" style="margin-left: 8px" @click="saveinfochange">保存</el-button>
|
|
|
<!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
|
|
|
<el-button type="primary" size="mini" @click="submitInfoChange"
|
|
|
@@ -27,14 +28,15 @@
|
|
|
<el-row>
|
|
|
|
|
|
<el-col :span="16">
|
|
|
- <el-form-item label="供方名称" prop="SupplierName" style="color:red;">
|
|
|
- <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly"
|
|
|
- :fetch-suggestions="querySearch" :maxlength="255" placeholder="请输入内容" style="width: 100%"
|
|
|
- @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
|
|
|
- </el-autocomplete>
|
|
|
+ <el-form-item label="供方名称" prop="SupplierName">
|
|
|
+ <!-- <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly" :fetch-suggestions="querySearch"
|
|
|
+ :maxlength="255" placeholder="请输入内容" style="width: 100%" @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
|
|
|
+ </el-autocomplete> -->
|
|
|
+ <el-input v-model="formData.SupplierName" :maxlength="255" :readonly="!canUpdateSupplier"
|
|
|
+ placeholder="请输入" style="width: 100%" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
|
|
|
+ </el-input>
|
|
|
<el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName"
|
|
|
:readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"
|
|
|
- :class="getchange('SupplierName') ? 'modified-form-input' : ''"
|
|
|
v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
@@ -425,8 +427,8 @@
|
|
|
</el-dialog>
|
|
|
<choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
|
|
|
:visible="chooseAuditorVisible"></choose-auditor>
|
|
|
- <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
|
|
|
- <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
|
|
|
+ <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
|
|
|
+ <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -438,11 +440,11 @@
|
|
|
import _ from 'lodash';
|
|
|
import supplierapi from '@/api/oilsupplier/supplier';
|
|
|
import api from '@/api/oilsupplier/infochange';
|
|
|
- import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
|
|
|
+ import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
|
|
|
import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
|
|
|
export default {
|
|
|
components: {
|
|
|
- WfBackHistory,
|
|
|
+ WfMultiHistory,
|
|
|
ChooseAuditor
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -451,12 +453,6 @@
|
|
|
})
|
|
|
},
|
|
|
name: 'oilinfochangeEdit',
|
|
|
- props: {
|
|
|
- formData: {
|
|
|
- type: Object,
|
|
|
- default: {}
|
|
|
- },
|
|
|
- },
|
|
|
watch: {
|
|
|
formData: {
|
|
|
handler(newValue) {
|
|
|
@@ -564,6 +560,12 @@
|
|
|
value: '3',
|
|
|
label: '常规'
|
|
|
}],
|
|
|
+ entrydetail: {
|
|
|
+ process: "oil_info_change",
|
|
|
+ business: "",
|
|
|
+ instance: "",
|
|
|
+ Status: '',
|
|
|
+ },
|
|
|
disabled: false,
|
|
|
canUpdateSupplier: true,
|
|
|
audithistoryshow: false,
|
|
|
@@ -709,6 +711,11 @@
|
|
|
AuditIndex: 0,
|
|
|
PACNumber: ""
|
|
|
},
|
|
|
+ Infomain: {
|
|
|
+ BusinessKey: '',
|
|
|
+ WorkFlowId: '',
|
|
|
+ Status: '',
|
|
|
+ },
|
|
|
chooseAuditorVisible: false,
|
|
|
fushenauditer: '', //复审人员
|
|
|
auditer: '',
|
|
|
@@ -873,6 +880,7 @@
|
|
|
},
|
|
|
methods: {
|
|
|
initDatas() {
|
|
|
+ this.getMainInfo()
|
|
|
if (this.formData.Id) {
|
|
|
api.GetChangeEntity(this.formData.Id, this.$axios)
|
|
|
.then(res => {
|
|
|
@@ -886,13 +894,28 @@
|
|
|
this.LinkCityAry.push(this.formData.LinkProvince)
|
|
|
this.LinkCityAry.push(this.formData.LinkCity)
|
|
|
this.LinkCityAry.push(this.formData.LinkStreet)
|
|
|
- console.log("this.formData", this.formData)
|
|
|
})
|
|
|
.catch(err => {
|
|
|
console.error(err);
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ getMainInfo() {
|
|
|
+ api.GetMainInfo(this.MInfoId, this.$axios)
|
|
|
+ .then(res => {
|
|
|
+ this.Infomain = res.data.items;
|
|
|
+ console.log("this.Infomain", this.Infomain)
|
|
|
+ if (this.Infomain.length > 0) {
|
|
|
+ this.entrydetail.business = this.Infomain[0].BusinessKey + ''
|
|
|
+ this.entrydetail.instance = this.Infomain[0].WorkFlowId + ''
|
|
|
+ this.entrydetail.Status = this.Infomain[0].Status + ''
|
|
|
+ }
|
|
|
+ console.log("---ent", this.entrydetail)
|
|
|
+ })
|
|
|
+ .catch(err => {
|
|
|
+ console.error(err);
|
|
|
+ });
|
|
|
+ },
|
|
|
getchange(key) {
|
|
|
if (this.infochangedata) {
|
|
|
for (var i = 0; i < this.infochangedata.length; i++) {
|
|
|
@@ -909,7 +932,6 @@
|
|
|
api.getEntityThen(this.MInfoId, this.$axios)
|
|
|
.then(res => {
|
|
|
this.infochangedata = res.data.items;
|
|
|
- console.log("this.infochangedata", this.infochangedata)
|
|
|
})
|
|
|
.catch(err => {
|
|
|
console.error(err);
|
|
|
@@ -928,7 +950,6 @@
|
|
|
_this.infochangeItemList.push(_this.infochangeForm)
|
|
|
}
|
|
|
})
|
|
|
- console.log("-3--", _this.infochangeItemList)
|
|
|
},
|
|
|
showorhid(val) {
|
|
|
console.log(val)
|
|
|
@@ -1076,7 +1097,6 @@
|
|
|
this.entityForm.fushenauditer = this.fushenauditer
|
|
|
this.entityForm.auditer = this.auditer
|
|
|
this.entityForm.MInfoId = this.MInfoId + ""
|
|
|
- console.log("==this.entityForm====", this.entityForm)
|
|
|
api.commitAuditEntity(this.supplierId, this.entityForm, this.$axios).then(res => {
|
|
|
if (res.data.code === 0) {
|
|
|
// 保存成功后，初始化数据，变成修改
|
huahaiyan