bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能新增

This commit is contained in:
hongchao 2025-03-28 18:27:36 +08:00
parent 1944aa9ca3
commit 870920f3b4
5 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
View File

@ -58,20 +58,6 @@
<el-form-item label="协议号" prop="agreementCode">
<el-input maxlength="50" v-model="queryParams.agreementCode" disabled style="width: 240px"></el-input>
</el-form-item>
<el-form-item label="成套设备" prop="agreementCode">
<el-select
clearable
style="width: 240px"
placeholder="请选择成套设备"
@change="onChangeWholeTypeName"
@remove-tag="onRemoveTag"
v-model="queryParams.wholeTypeName"
multiple
:disabled="isEdit"
>
<el-option v-for="item in holdingPoleSelList" :key="item.id" :label="item.wholeTypeName" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="类型名称" prop="status">
<el-cascader
filterable
@ -79,7 +65,7 @@
:key="propsKey"
style="width: 240px"
v-model="deviceType"
:show-all-levels="false"
:show-all-levels="true"
ref="deviceTypeCascader"
:options="deviceTypeTree"
@change="deviceTypeChange"
@ -100,6 +86,20 @@
<el-option v-for="item in typeListDev" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="成套设备" prop="agreementCode">
<el-select
clearable
style="width: 240px"
placeholder="请选择成套设备"
@change="onChangeWholeTypeName"
@remove-tag="onRemoveTag"
v-model="queryParams.wholeTypeName"
multiple
:disabled="isEdit"
>
<el-option v-for="item in holdingPoleSelList" :key="item.id" :label="item.wholeTypeName" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="预计领料时间" prop="estimateLeaseTime">
<el-date-picker
v-model="queryParams.estimateLeaseTime"
@ -1174,7 +1174,7 @@ export default {
this.$message.error('当前设备已添加，不可重复添加！')
return
}
this.leaseApplyDetails.push({ ...this.selectParams })
this.leaseApplyDetails.unshift({ ...this.selectParams })
console.log('🚀 ~ changeType ~ this.leaseApplyDetails:', this.leaseApplyDetails)
},
},

4
src/views/claimAndreturn/picking/apply/component/home1.vue
View File

@ -172,14 +172,14 @@
align="center"
prop="unitName"
:show-overflow-tooltip="true"
width="150"
width="220"
/>
<el-table-column
label="领料工程"
align="center"
prop="proName"
:show-overflow-tooltip="true"
width="150"
width="220"
/>
<el-table-column
label="协议号"

4
src/views/claimAndreturn/picking/auditing/component/home1.vue
View File

@ -114,8 +114,8 @@
<span v-if="scope.row.leaseType == 1">长期领用</span>
</template>
</el-table-column>
<el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="130"/>
<el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="130"/>
<el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="220"/>
<el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="220"/>
<el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" width="120"/>

4
src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -63,8 +63,8 @@
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
/>
<el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
<el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="领料申请工程" align="center" prop="proName" :show-overflow-tooltip="true" />
<el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="220"/>
<el-table-column label="领料申请工程" align="center" prop="proName" :show-overflow-tooltip="true" width="220"/>
<el-table-column
label="申请数量"
align="center"

13
src/views/cost/csotSettlement/component/finishAndDetails.vue
View File

@ -94,7 +94,7 @@
size="mini"
type="primary"
@click="submitComSett"
v-if="currRowInfo[0].isSlt == 0"
v-if="currRowInfo[0].isSlt == 0 || currRowInfo[0].isSlt == 2"
>确认完工结算</el-button
>
</el-row>
@ -268,7 +268,13 @@ export default {
},
/** 确认结算 01或03 */
async submitSell(type) {
const agreementIds = [...new Set(this.settleTableData_01.map(item => item.agreementId))];
let agreementIds = []
if(type == "01"){
agreementIds = [...new Set(this.settleTableData_01.map(item => item.agreementId))];
}else if(type == "03"){
agreementIds = [...new Set(this.settleTableData_03.map(item => item.agreementId))];
}
const sellParams = {
agreementIds: agreementIds,
costBearingParty: type,
@ -336,7 +342,8 @@ export default {
// 3. 组装请求参数
const params = {
repairIds: repairIds.join(','),
agreementId: this.currRowInfo.agreementId,
agreementIds:[...new Set(this.currRowInfo.map(item => item.agreementId))],
// agreementId: this.currRowInfo[0].agreementId,
relation: {
leaseCostOne: this.settleTotalPrice_01, // 01承担方费用
leaseCostThree: this.settleTotalPrice_03, // 0.承担方