|
@@ -138,14 +138,14 @@
|
|
<span>{{ form.verifyRemark }}</span>
|
|
<span>{{ form.verifyRemark }}</span>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="8" style="width: 100%">
|
|
|
|
|
|
+ <el-col :span="6" style="width: 100%">
|
|
<el-form-item label="来源" prop="sourceCategoryName" style="width: 100%">
|
|
<el-form-item label="来源" prop="sourceCategoryName" style="width: 100%">
|
|
<CustomerFormCom ref="CustomerFormComRef" :edit-status="editStatus && type !== 'alterOrder'"
|
|
<CustomerFormCom ref="CustomerFormComRef" :edit-status="editStatus && type !== 'alterOrder'"
|
|
:form-data="form" :source-categories="sourceCategories" />
|
|
:form-data="form" :source-categories="sourceCategories" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="4">
|
|
|
|
- <el-form-item label="客户标签" prop="customerLabelId">
|
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
+ <el-form-item label-width="100px" label="客户标签" prop="customerLabelId">
|
|
<span>{{ selectedOptionLabel }}</span>
|
|
<span>{{ selectedOptionLabel }}</span>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -163,7 +163,7 @@
|
|
<span v-else>{{ form.party }}</span>
|
|
<span v-else>{{ form.party }}</span>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="8">
|
|
|
|
|
|
+ <el-col :span="6">
|
|
<el-form-item label="备注" prop="remark">
|
|
<el-form-item label="备注" prop="remark">
|
|
<el-input v-if="editStatus" v-model="form.remark" show-word-limit maxlength="200"
|
|
<el-input v-if="editStatus" v-model="form.remark" show-word-limit maxlength="200"
|
|
style="width: 100%; margin: 0; padding: 0" placeholder="请输入备注" type="textarea" :rows="2" />
|
|
style="width: 100%; margin: 0; padding: 0" placeholder="请输入备注" type="textarea" :rows="2" />
|
|
@@ -175,7 +175,7 @@
|
|
<dict-tag :options="contract_status" :value="form.status" />
|
|
<dict-tag :options="contract_status" :value="form.status" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="5">
|
|
|
|
|
|
+ <el-col :span="6">
|
|
<el-form-item v-if="!editStatus && form.dissolution === 1" label="解除时间" prop="dissolution">
|
|
<el-form-item v-if="!editStatus && form.dissolution === 1" label="解除时间" prop="dissolution">
|
|
<span >{{ form.dissDate }}</span>
|
|
<span >{{ form.dissDate }}</span>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -1264,7 +1264,7 @@
|
|
function getForm() {
|
|
function getForm() {
|
|
proxy.$refs.orderRef.resetFields();
|
|
proxy.$refs.orderRef.resetFields();
|
|
loading.value = true;
|
|
loading.value = true;
|
|
- getOrder(form.value.id).then((response) => {
|
|
|
|
|
|
+ return getOrder(form.value.id).then((response) => {
|
|
loading.value = false;
|
|
loading.value = false;
|
|
form.value = response.data;
|
|
form.value = response.data;
|
|
type.value =
|
|
type.value =
|
|
@@ -1647,15 +1647,20 @@
|
|
}
|
|
}
|
|
|
|
|
|
function verifyUpload(status) {
|
|
function verifyUpload(status) {
|
|
- const formValue = proxy.deepClone(form.value);
|
|
|
|
- formValue.verifyStatus = status;
|
|
|
|
- formValue.status = status;
|
|
|
|
- verifyOrder(formValue).then((res) => {
|
|
|
|
- getForm();
|
|
|
|
- getList.value();
|
|
|
|
- rejectCancel();
|
|
|
|
- proxy.$modal.msgSuccess("保存成功");
|
|
|
|
- });
|
|
|
|
|
|
+
|
|
|
|
+ getForm().then(()=>{
|
|
|
|
+ const formValue = proxy.deepClone(form.value);
|
|
|
|
+ formValue.verifyStatus = status;
|
|
|
|
+ formValue.status = status;
|
|
|
|
+ verifyOrder(formValue).then((res) => {
|
|
|
|
+ getList.value();
|
|
|
|
+ rejectCancel();
|
|
|
|
+ form.value.status = status;
|
|
|
|
+ getForm();
|
|
|
|
+ proxy.$modal.msgSuccess("保存成功");
|
|
|
|
+ });
|
|
|
|
+ })
|
|
|
|
+ getList.value();
|
|
}
|
|
}
|
|
|
|
|
|
/** 文件上传 */
|
|
/** 文件上传 */
|