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

代码优化

This commit is contained in:
BianLzhaoMin 2024-09-18 18:03:31 +08:00
parent 7eb7701512
commit 107134bb82
9 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/claimAndreturn/return/apply/component/home1.vue
View File

@ -72,13 +72,13 @@
@changeId="selectDrop"
></Tree>
</el-form-item>
<el-form-item label="退料申请时间" prop="time">
<el-form-item label="退料申请时间">
<el-date-picker
v-model="queryParams.time"
v-model="returnTime"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
type="date"
type="daterange"
value-format="yyyy-MM-dd"
style="width: 240px"
></el-date-picker>
@ -649,12 +649,12 @@ export default {
lotId: '', //工程id
taskStatus: '', //状态
typeId: '', //工机具类型
time: '',
agreementCode: '', //协议
startTime: '',
endTime: '',
proId: '',
},
returnTime: [],
dialogQueryParams: {
pageNum: 1,
pageSize: 10,
@ -730,9 +730,9 @@ export default {
},
async getList() {
this.loading = true
if (this.queryParams.time && this.queryParams.time.length > 0) {
this.queryParams.startTime = this.queryParams.time[0]
this.queryParams.endTime = this.queryParams.time[1]
if (this.returnTime.length > 0) {
this.queryParams.startTime = this.returnTime[0]
this.queryParams.endTime = this.returnTime[1]
}
try {
@ -769,7 +769,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams.time = []
this.returnTime = []
this.queryParams.typeId = ''
this.$refs.mychildSon.inputValue = ''
// this.resetForm("queryForm");

1
src/views/claimAndreturn/return/receive/component/handlePage.vue
View File

@ -791,7 +791,6 @@ export default {
// })
console.log(this.deviceList, 'deviceList')
this.total = response.data.total
this.loading = false
})

2
src/views/store/warehousing/repairWarehousing.vue
View File

@ -18,7 +18,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="维修时间">
<el-form-item label="维修时间" prop="wxTime">
<el-date-picker
v-model="queryParams.wxTime"
style="width: 240px"

1
src/views/warehouseManage/machinery/coding/index.vue
View File

@ -77,6 +77,7 @@
clearable
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"

2
src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
View File

@ -558,7 +558,7 @@ export default {
watch: {
'maForm.purchaseTime'() {
if (this.maForm.purchaseTime != '') {
this.maForm.arrivalTime = ''
// this.maForm.arrivalTime = ''
}
},
},

2
src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
View File

@ -386,7 +386,7 @@ export default {
watch: {
'maForm.purchaseTime'() {
if (this.maForm.purchaseTime != '') {
this.maForm.arrivalTime = ''
// this.maForm.arrivalTime = ''
}
},
},

2
src/views/warehouseManage/warehousing/repair/index.vue
View File

@ -19,7 +19,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="维修时间">
<el-form-item label="维修时间" prop="wxTime">
<el-date-picker
v-model="queryParams.wxTime"
style="width: 240px"

2
src/views/warehouseManage/warehousing/return/index.vue
View File

@ -19,7 +19,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="提交入库时间">
<el-form-item label="提交入库时间" prop="submitStorageTime">
<el-date-picker
v-model="queryParams.submitStorageTime"
style="width: 240px"

9
vue.config.js
View File

@ -42,14 +42,12 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`,
// target: `http://192.168.2.152:39080`, //超
target: `http://192.168.2.1:39080`, //超
// target: `http://10.40.92.81:8080`, //韩/
// target: `http://192.168.10.105:49080`, //旭/
// target: `http://192.168.10.236:49080`, //旭/
// target: `http://192.168.43.200:49080`, //旭/
// target: `http://192.168.2.75:39080`, //旭/
// target: `http://192.168.2.17:39080`, //帅
// target: `http://192.168.2.234:49080`, //福
target: `http://192.168.2.116:49080`, //跃
// target: `http://192.168.0.56:21627`, //跃
//******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
@ -61,7 +59,6 @@ module.exports = {
// 登录跳转地址从/login换成/gl/login 3处;
//4. 重庆环境的时候 领料管理线上菜单与宁夏不同需要根据环境在线上菜单管理中修改组件路径
//******** 注意事项 ********* */
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '',