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

Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/cqdevicemgt into dev-cq-bug

This commit is contained in:
liang.chao 2024-08-13 10:53:35 +08:00
parent 5dae109c54 a7991c4005
commit c42d2099d1
9 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
View File

@ -598,7 +598,7 @@ export default {
this.queryParams.examineStatusId = '32'
}
this.queryParams.unitId = data.unitId
this.queryParams.costBearingParty = data?.costBearingParty
this.queryParams.costBearingParty = data.costBearingParty
this.queryParams.proId = data.proId
this.queryParams.leaseApplyInfo.phone =
data.leaseApplyInfoList[0].phone
@ -633,7 +633,7 @@ export default {
}
this.queryParams.unitId = data.unitId
this.queryParams.proId = data.proId
this.queryParams.costBearingParty = data?.costBearingParty
this.queryParams.costBearingParty = data.costBearingParty
this.queryParams.leaseApplyInfo.phone =
data.leaseApplyInfoList[0].phone
this.queryParams.leaseApplyInfo.leasePerson =
@ -889,4 +889,3 @@ export default {
},
}
</script>

5
sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
View File

@ -100,7 +100,7 @@
<el-form-item
v-if="domain.partType == 1"
:prop="'premiumList.' + index + '.partCost'"
label="配件费用："
label="配件单价："
:rules="{
required: false,
validator: meneyIntegerValidator,
@ -267,8 +267,9 @@
></el-input>
</el-form-item>
<el-form-item
v-if="domain.partType == 1"
:prop="'premiumListTwo.' + index + '.partCost'"
label="配件费用："
label="配件单价："
:rules="{
required: false,
validator: meneyIntegerValidator,

3
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
View File

@ -791,7 +791,8 @@ export default {
this.$tab.closeOpenPage(obj)
},
async handleBindDetails(row) {
console.log('🚀 ~ handleBindDetails ~ row:', row.taskId)
console.log('🚀 ~ handleBindDetails ~ row:', row.taskId, row)
this.surplusNoBindNum = row.checkNum - row.bindNum
this.open = true
this.isDetail = true
this.title = '编码绑定详情'

1
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
View File

@ -558,7 +558,6 @@ export default {
// .then(() => {
// this.$tab.refreshPage()
// })
this.$emit('queryTools', row.taskId)
},
/** 修改按钮操作 */

1
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
View File

@ -190,6 +190,7 @@
>
验收
</el-button>
<!-- <el-button
size="mini"
type="text"

1
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue
View File

@ -71,6 +71,7 @@ export default {
/* 查询工机具 */
queryTools(taskId) {
this.isView = true
this.pageContent = '详情信息'
this.queryTaskId = taskId
this.isShowComponent = 'QueryTools'

42
sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
View File

@ -306,18 +306,21 @@
</el-select>
</el-form-item>-->
<el-form-item label="机具类型" prop="typeId">
<treeselect
<el-form-item label="配件类型" prop="typeId">
<el-select
v-model="query.typeId"
default-expand-all
:options="equipmentTypeList"
placeholder="请选择规格型号"
:disable-branch-nodes="true"
placeholder="请选择配件类型"
clearable
filterable
style="width: 240px"
noChildrenText="没有数据了"
noOptionsText="没有数据"
noResultsText="没有搜索结果"
>
<el-option
v-for="typeItem in typeList"
:key="typeItem.partId"
:label="typeItem.partName"
:value="typeItem.partId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
@ -467,9 +470,13 @@
</el-dialog>
<!-- 入库单弹窗 -->
<el-dialog :visible.sync="openPrint" width="900px" append-to-body>
<div style="height: 400px; overflow-y: scroll">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<el-dialog :visible.sync="openPrint" width="80%" append-to-body>
<div>
<vue-easy-print
tableShow
ref="remarksPrintRef"
class="print print-content"
>
<div
class="title"
style="
@ -528,16 +535,7 @@
<span>车辆信息：</span>
</div> -->
</div>
<el-table
:data="printTableData"
class="table"
style="
margin-top: 20px;
padding-bottom: 1px;
padding-right: 1px;
"
border
>
<el-table :data="printTableData" class="table">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column
label="序号"

2
sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
View File

@ -713,6 +713,7 @@ export default {
maCode: row.maCode,
typeId: row.typeId,
num: row.num,
manageType: row.manageType,
}
let param = {
@ -766,6 +767,7 @@ export default {
maCode: row.maCode,
inputNum: row.checkNum,
typeId: row.typeId,
manageType: row.manageType,
}
let param = {

4
sgzb-ui/vue.config.js
View File

@ -42,11 +42,11 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`,
target: `http://192.168.2.154:39080`, //超
// target: `http://192.168.2.154:39080`, //超
// target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/
// target: `http://10.40.92.138:28080`, //帅
// target: `http://10.40.92.253:28080`, //福
target: `http://192.168.2.216:39080`, //福
// target: `http://192.168.2.120:39080`, //跃
//******** 注意事项 ********* */