|
|
|
@ -58,6 +58,7 @@ |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" v-if="scope.row.statusCode==='05'" @click="comfirmApply(scope.row)">下达</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.statusCode==='05'" @click="editModalU(scope.row)">修改</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.status=='审批中'" @click="editModal(scope.row)">审批</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.statusCode==='05'" @click="cancelApply(scope.row)">取消申请</a> |
|
|
|
</template> |
|
|
|
@ -138,6 +139,10 @@ |
|
|
|
</el-table> |
|
|
|
|
|
|
|
</el-tab-pane> |
|
|
|
<!-- 审批信息 --> |
|
|
|
<el-tab-pane label="审批信息" name="approvalInformation"> |
|
|
|
<approval-information ref="approvalTable" v-model:data-list="approvalList" :height="240"></approval-information> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="附件信息" name="down"> |
|
|
|
<oss-components height="25vh" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components> |
|
|
|
|
|
|
|
@ -183,10 +188,6 @@ |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<!-- </el-table>--> |
|
|
|
</el-tab-pane> |
|
|
|
<!-- 审批信息 --> |
|
|
|
<el-tab-pane label="审批信息" name="approvalInformation"> |
|
|
|
<approval-information ref="approvalTable" v-model:data-list="approvalList" :height="240"></approval-information> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="处理信息" name="tab4"> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-top: 0px"> |
|
|
|
<!-- <el-button type="primary" :disabled="!(currentRow.statusCode==='50'||currentRow.statusCode==='60')" @click="openMassageModel()">申请信息录入</el-button>--> |
|
|
|
@ -232,6 +233,96 @@ |
|
|
|
</el-form> |
|
|
|
</el-tab-pane> |
|
|
|
</el-tabs> |
|
|
|
<el-dialog |
|
|
|
width="800px" v-drag |
|
|
|
:title="'刀模申请修改'" |
|
|
|
:close-on-click-modal="false" |
|
|
|
:visible.sync="visibleU"> |
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" > |
|
|
|
<el-form-item :label="'申请编号'"> |
|
|
|
<el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'申请总数'"> |
|
|
|
<el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="部门" required="required"> |
|
|
|
<dict-data-select :site="$store.state.user.site" v-model="dataForm.department" dict-type="tool_application_department" disabled style="width: 130px"></dict-data-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'申请人'" required="required"> |
|
|
|
<el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'申请日期'" required="required"> |
|
|
|
<el-date-picker |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
style="width: 100%" |
|
|
|
v-model="dataForm.applyDate" |
|
|
|
type="date" |
|
|
|
disabled |
|
|
|
placeholder="结束日期"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item required="required"> |
|
|
|
<span slot="label" style="" @click="getBaseList(103,1)"><a herf="#">报价员</a></span> |
|
|
|
<el-input v-model="dataForm.quoterName" ref="quoterName" placeholder="请选择人员" readonly style="width: 130px" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item required="required"> |
|
|
|
<span slot="label" style="" @click="getBaseList(103,2)"><a herf="#">TP</a></span> |
|
|
|
<el-input v-model="dataForm.tpName" ref="tpName" placeholder="请选择人员" readonly style="width: 130px" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item required="required"> |
|
|
|
<span slot="label" style="" @click="getBaseList(103,3)"><a herf="#">采购员</a></span> |
|
|
|
<el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" > |
|
|
|
<el-form-item :label="'申请原因'"> |
|
|
|
<el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}" |
|
|
|
v-model="dataForm.applyReason"/> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 60px"> |
|
|
|
<el-form-item :label="'备注'"> |
|
|
|
<el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}" |
|
|
|
v-model="dataForm.remark"/> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<div class="rq" style="margin-top: 60px"> |
|
|
|
<el-table |
|
|
|
height="250" |
|
|
|
:data="toolData" |
|
|
|
border |
|
|
|
ref="toolTable" |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnList2" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
:prop="item.columnProp" |
|
|
|
:header-align="item.headerAlign" |
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
:align="item.align" |
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<div v-if="item.columnProp !== 'applyQty' "> |
|
|
|
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" |
|
|
|
style="width: 100px; height: 80px"/></span> |
|
|
|
</div> |
|
|
|
<div v-else> |
|
|
|
<el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)" placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" |
|
|
|
style="width:98%"></el-input> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button type="primary" @click="saveData()">{{'保存'}}</el-button> |
|
|
|
<el-button type="primary" @click="visibleU = false">{{'取消'}}</el-button> |
|
|
|
</span> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog |
|
|
|
width="800px" v-drag |
|
|
|
@ -319,7 +410,7 @@ |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button type="primary" @click="saveData()">{{'保存'}}</el-button> |
|
|
|
<!-- <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>--> |
|
|
|
<el-button type="primary" @click="visible = false">{{'取消'}}</el-button> |
|
|
|
<el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit">同意</el-button> |
|
|
|
<el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal">驳回</el-button> |
|
|
|
@ -447,6 +538,7 @@ |
|
|
|
endDate:'', |
|
|
|
}, |
|
|
|
toolData:[], |
|
|
|
visibleU:false, |
|
|
|
dataForm:{ |
|
|
|
site: '', |
|
|
|
applyNo: '', |
|
|
|
@ -1310,6 +1402,39 @@ |
|
|
|
}) |
|
|
|
this.visible=true |
|
|
|
}, |
|
|
|
editModalU (row) { |
|
|
|
this.getNodeAuthority(row) |
|
|
|
this.dataForm = { |
|
|
|
site: row.site, |
|
|
|
applyNo: row.applyNo, |
|
|
|
applyBy: row.applyBy, |
|
|
|
applyDate: row.applyDate, |
|
|
|
applySumQty: row.applySumQty, |
|
|
|
applyReason: row.applyReason, |
|
|
|
remark: row.remark, |
|
|
|
createBy: row.createBy, |
|
|
|
department:row.department, |
|
|
|
detailList: [], |
|
|
|
status: row.status, |
|
|
|
rejectOpinion: '', |
|
|
|
nodeConclusion: '', |
|
|
|
quoter: row.quoter, |
|
|
|
quoterName: row.quoterName, |
|
|
|
tp: row.tp, |
|
|
|
tpName: row.tpName, |
|
|
|
purchaser: row.purchaser, |
|
|
|
purchaserName: row.purchaserName, |
|
|
|
menuId: this.$route.meta.menuId, |
|
|
|
userName: this.$store.state.user.name, |
|
|
|
} |
|
|
|
searchProjectToolApplyDetail({ site: row.site, |
|
|
|
applyNo: row.applyNo,}).then(({data}) => { |
|
|
|
if (data.code == 0) { |
|
|
|
this.toolData = data.rows |
|
|
|
} |
|
|
|
}) |
|
|
|
this.visibleU=true |
|
|
|
}, |
|
|
|
comfirmApply (row) { |
|
|
|
this.$confirm(`确定下达这个申请`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
@ -1571,6 +1696,7 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
this.visible = false |
|
|
|
this.visibleU = false |
|
|
|
this.refreshCurrentTabTable() |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
|
