Commit 794c3215 authored by 谢子梦's avatar 谢子梦

stage:发包任务管理问题修复

parent 4dba3095
......@@ -89,13 +89,8 @@
v-hasPermi="['business:onlineTaskInfo:recived']" @click="handleRecivedVisible(scope.row)">接收任务</el-button>
<el-button v-if="scope.row.status == 21" size="mini" type="text" icon="el-icon-upload"
v-hasPermi="['business:onlineTaskInfo:importPayInfo']" @click="importPayInfo(scope.row)">导入名单</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['business:onlineTaskInfo:edit']"
>修改</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['business:onlineTaskInfo:edit']">修改</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
......@@ -135,8 +130,8 @@
<el-form-item label="所属行业" prop="industry">
<el-input v-model="form.industry" placeholder="请输入所属行业" />
</el-form-item>
<el-form-item label="代发企业" prop="taxCompanySignId">
<el-select v-model="form.taxCompanySignId" placeholder="请选择代发企业" clearable @change="taxCompanyChange">
<el-form-item label="代发企业" prop="taxCompanyId">
<el-select v-model="form.taxCompanyId" placeholder="请选择代发企业" clearable @change="taxCompanyChange">
<el-option v-for="item in taxCompanyList" :key="item.id" :label="item.taxUnitName"
:value="item.id"></el-option>
</el-select>
......@@ -145,7 +140,8 @@
<!-- <el-input v-model="form.araeCode" placeholder="请输入地区code" />-->
<!-- </el-form-item>-->
<el-form-item label="所在区域" prop="area">
<el-cascader style="width: 100%;" size="small" :options="options" v-model="form.selectedOptions" @change="handleChange" />
<el-cascader style="width: 100%;" size="small" :options="options" v-model="form.selectedOptions"
@change="handleChange" />
</el-form-item>
<!-- <el-form-item label="所在区域" prop="area">
<el-input v-model="form.area" placeholder="请输入所在区域" />
......@@ -216,12 +212,12 @@
</el-dialog>
<el-dialog title="接受任务并签订合同" :visible.sync="receiveSignVisible" width="40%" center>
<div style="margin: 20px;padding: 20px;">
<iframe :src=this.contractUrl style="width:100%;height:600px;" frameborder="0"></iframe>
</div>
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click.native="handleRecived">接收任务并签订合同</el-button>
</div>
<div style="margin: 20px;padding: 20px;">
<iframe :src=this.contractUrl style="width:100%;height:600px;" frameborder="0"></iframe>
</div>
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click.native="handleRecived">接收任务并签订合同</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -414,6 +410,8 @@ export default {
this.applyCompanyList = response.rows;
} else if (bindType == 2) {
this.taxCompanyList = response.rows;
// console.log('返回的企业信息', this.taxCompanyList);
}
this.loading = false;
});
......@@ -433,6 +431,7 @@ export default {
return;
}
this.taxCompanyList = response.rows;
// console.log('返回的企业信息', this.taxCompanyList);
}
})
},
......@@ -517,17 +516,19 @@ export default {
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getOnlineTaskInfo(id).then(response => {
getOnlineTaskInfo(id).then(async (response) => {
await this.queryTaxCompanyList(response.data.companyId);
this.form = response.data;
//查询合作机构list
//服务时间
this.form.serviceTimeArr = [this.form.serviceTimeStart, this.form.serviceTimeEnd];
//查询合作机构list
this.queryTaxCompanyList(this.form.companyId);
this.onlineTaskId = row.id;
// console.log(this.form);
this.open = true;
this.title = "修改线上任务信息";
this.$forceUpdate();
});
},
/** 提交按钮 */
......@@ -725,24 +726,24 @@ export default {
confirmSealContractFile() {
// TODO 确认框
// this.$modal.confirm('是否确认签订合同?').then(() => {
// 添加 loading 提示
this.$modal.loading("正在签订合同,请稍候...");
const obj = { id: this.onlineTaskId, status: 10 };
signContractFile(obj).then(response => {
if (response.code === 200) {
this.$modal.msgSuccess("签订合同成功");
this.contractUrl = response.data;
this.active = 3;
this.getList();
} else {
this.$modal.msgError("签订合同失败:" + (response.msg || "未知错误"));
}
}).catch(error => {
console.error("签订合同接口调用失败", error);
this.$modal.msgError("签订合同失败,请稍后再试");
}).finally(() => {
this.$modal.closeLoading()
});
// 添加 loading 提示
this.$modal.loading("正在签订合同,请稍候...");
const obj = { id: this.onlineTaskId, status: 10 };
signContractFile(obj).then(response => {
if (response.code === 200) {
this.$modal.msgSuccess("签订合同成功");
this.contractUrl = response.data;
this.active = 3;
this.getList();
} else {
this.$modal.msgError("签订合同失败:" + (response.msg || "未知错误"));
}
}).catch(error => {
console.error("签订合同接口调用失败", error);
this.$modal.msgError("签订合同失败,请稍后再试");
}).finally(() => {
this.$modal.closeLoading()
});
// }).catch(() => {
// // 用户取消操作
// this.$modal.msgError("已取消签订合同");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment