wangyifang
/
cz-hjjc-ht
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init

Browse Source
master
xy 12 months ago
parent 011652e0ea
commit 09165e9da5
4 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File

3
src/components/PlanPicker/index.vue
Unescape View File

@ -164,8 +164,9 @@ export default {
{
label: "内容",
prop: "content",
minWidth: 200,
minWidth: 240,
align: "left",
showOverflowTooltip: true
},
{
label: "计划金额",

1
src/components/XyTable/index.vue
Unescape View File

@ -283,6 +283,7 @@ export default {
header-align={item.headerAlign ?? 'center'}
align={item.align ?? 'center'}
label={item.label}
show-overflow-tooltip={item.showOverflowTooltip ?? false}
prop={item.prop}
sortable={item.sortable ?? false}
type={item.type}

4
src/views/contract/contractEdit.vue
Unescape View File

@ -1209,8 +1209,9 @@ export default {
{
label: "内容",
prop: "content",
minWidth: 200,
minWidth: 240,
align: "left",
showOverflowTooltip: true
},
{
label: "计划金额",
@ -1318,6 +1319,7 @@ export default {
},
handleDefaultJSON () {
let defaultJSON;
console.log(this.$route)
try {
if (!this.$route.query.default_json) return;
defaultJSON = JSON.parse(this.$route.query.default_json)

84
src/views/contract/contractList.vue
Unescape View File

@ -1196,22 +1196,26 @@ export default {
<div>
<div style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.zhaobiao.getStatus()), 'display': 'flex', 'align-items': 'center', 'justify-content': 'center' }}>
<span>{ this.flowStatus.get(row.FLOWSTATUS.zhaobiao.getStatus()) || '无' }</span>
<el-popover title="是否需要招标审核" placement="bottom-start" width="160">
<el-switch active-value={1}
v-model={row.is_tender_audit}
inactive-value={0}
active-text="是"
inactive-text="否"
on={{
change: e => {
editorContract({
id: row.id,
is_tender_audit: e
}).then(_ => this.getContracts())
}
}}></el-switch>
<i class="el-icon-info" style="margin-left: 8px;font-size: 17px;" slot="reference"></i>
</el-popover>
{
row.is_purchase ? (
<el-popover title="是否需要招标审核" placement="bottom-start" width="160">
<el-switch active-value={1}
v-model={row.is_tender_audit}
inactive-value={0}
active-text="是"
inactive-text="否"
on={{
change: e => {
editorContract({
id: row.id,
is_tender_audit: e
}).then(_ => this.getContracts())
}
}}></el-switch>
<i class="el-icon-info" style="margin-left: 8px;font-size: 17px;" slot="reference"></i>
</el-popover>
) : ''
}
</div>
{
(row.FLOWSTATUS.zhaobiao.getStatus() !== 2 && row.FLOWSTATUS.zhaobiao.getStatus() !== -2) ? <a style="color: #333" on={{['click']:()=>{
@ -1232,22 +1236,26 @@ export default {
<div>
<div style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.shenpi.getStatus()), 'display': 'flex', 'align-items': 'center', 'justify-content': 'center' }}>
<span>{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) }</span>
<el-popover title="是否需要合同审批" placement="bottom-start" width="160">
<el-switch active-value={1}
v-model={row.is_contract}
inactive-value={0}
active-text="是"
inactive-text="否"
on={{
'change':e => {
editorContract({
id: row.id,
is_contract: e
}).then(_ => this.getContracts())
}
}}></el-switch>
<i class="el-icon-info" style="margin-left: 8px;font-size: 17px;" slot="reference"></i>
</el-popover>
{
row.is_purchase ? (
<el-popover title="是否需要合同审批" placement="bottom-start" width="160">
<el-switch active-value={1}
v-model={row.is_contract}
inactive-value={0}
active-text="是"
inactive-text="否"
on={{
'change': e => {
editorContract({
id: row.id,
is_contract: e
}).then(_ => this.getContracts())
}
}}></el-switch>
<i class="el-icon-info" style="margin-left: 8px;font-size: 17px;" slot="reference"></i>
</el-popover>
) : ''
}
</div>
{
(row.FLOWSTATUS.shenpi.getStatus() !== 2 && row.FLOWSTATUS.shenpi.getStatus() !== -2) ? <a style="color: #333" on={{['click']:()=>this.toOaDetail('hetong',row)}}>查看</a> : ''
@ -1722,7 +1730,7 @@ export default {
let url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=`
switch (tbname) {
case "caigou":
let caigou = row.is_common_purchase ? row.flow_list.find(i => i.tag === 'common_purchase') : row.flow_list.find(i => i.tag === 'caigou')
let caigou = row.is_common_purchase ? row.flow_list.find(i => i.tag === 'common_purchase') : row.flow_list.find(i => i.custom_model_id === row.flow_mod_id)
//url += `&to=/flow/detail?flow_id=${caigou.id}`
url += caigou?.flow_id
break;
@ -2350,6 +2358,7 @@ export default {
const common_purchase = item.flow_list.find(i => i.tag === 'common_purchase')
const caigou = item.flow_list.find(i => i.custom_model_id === item.flow_mod_id)
const shenpi = item.flow_list.find(i => i.tag === 'contract')
const other = item.flow_list.find(i => i.custom_model_id === item.flow_mod_id)
if (item.is_purchase) {
//为采购项目
if (!item.is_common_purchase) {
@ -2393,7 +2402,6 @@ export default {
}
} else {
if (item.flow_mod_id) {
const other = item.flow_list.find(i => i.custom_model_id === item.flow_mod_id)
//非采购事前流程
flowStatus["other"].setStatus(other?.flow_status ?? 2)
if (!other || other.flow_status === 2) {
@ -2404,9 +2412,13 @@ export default {
if (item.is_end === 0) {
flowStatus["zhifu"].setStatus(2)
//最后一笔没付完
if ((item.is_purchase === 0 && item.other_flow_status === 3) || (!item.is_contract && !item.is_substitute && caigou?.flow_status === 1) || (item.purchase_way?.value === "网上商城" && caigou?.flow_status === 1) ||
if (
(item.is_purchase === 0 && other?.flow_status === 1) ||
item.status === 2 ||
(!item.is_contract && item.is_simple) || (item.is_contract && item.is_substitute && shenpi?.flow_status === 1)) {
(!item.is_contract && item.is_simple) ||
(item.is_tender_audit && !item.is_contract && shenpi?.flow_status === 1) ||
(!item.is_tender_audit && !item.is_contract && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1))
) {
//网上商场的话采购完成 合同签订完成 不为合同并且为简易
flowStatus["zhifu"].setExecutable(true)
}

Write Preview
Loading…
Cancel
Save