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

优化

This commit is contained in:
bb_pan 2025-03-05 18:15:49 +08:00
parent 7b3b9f59c5
commit 979bfe92f6
7 changed files with 1343 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
prettier.config.js
View File

@ -1,5 +1,6 @@
module.exports = { module.exports = {
tabWidth: 4, printWidth: 120,
tabWidth: 2,
semi: false, semi: false,
vueIndentScriptAndStyle: false, vueIndentScriptAndStyle: false,
singleQuote: true, singleQuote: true,

12
src/api/claimAndRefund/receive.js
View File

@ -360,4 +360,16 @@ export function submitUpdateBackApply(data) {
method: 'post', method: 'post',
data, data,
}) })
}
// 根据id 查4级规格类型
export function getMaTypeDataById(data) {
return request({
url: '/material/select/getMaTypeDataById',
method: 'post',
headers: {
repeatSubmit: false,
},
data,
})
} }

1225
src/views/claimAndreturn/picking/auditing/component/EditPicking.vue Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -222,7 +222,14 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList.length > 0 && scope.row.leaseApplyInfoList[0].remark">{{ scope.row.leaseApplyInfoList[0].remark }}</span> <span
v-if="
scope.row.leaseApplyInfoList &&
scope.row.leaseApplyInfoList.length > 0 &&
scope.row.leaseApplyInfoList[0].remark
"
>{{ scope.row.leaseApplyInfoList[0].remark }}</span
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="160" align="center"> <el-table-column label="操作" width="160" align="center">
@ -252,7 +259,14 @@
v-if="Number(scope.row.examineStatusId) == 32" v-if="Number(scope.row.examineStatusId) == 32"
>审批</el-button >审批</el-button
> >
<el-button
v-if="Number(scope.row.examineStatusId) == 31"
size="mini"
type="text"
@click="handleEdit(scope.row)"
style="color: #e6a23c"
>编辑</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -643,6 +657,10 @@ export default {
// }) // })
this.$emit('pickingView', row.taskId) this.$emit('pickingView', row.taskId)
}, },
// 编辑
handleEdit(row) {
this.$emit('editPicking', row)
},
//打开领料单 //打开领料单
async openLld(row) { async openLld(row) {
this.open = true this.open = true

21
src/views/claimAndreturn/picking/auditing/index.vue
View File

@ -10,9 +10,13 @@
:is="isShowComponent" :is="isShowComponent"
:isView="isView" :isView="isView"
:auditingTaskId="auditingTaskId" :auditingTaskId="auditingTaskId"
:viewTaskId="viewTaskId"
:isEdit="isEdit"
:rejectTaskStatus="rejectTaskStatus"
@pickingView="pickingView" @pickingView="pickingView"
@pickingAuditing="pickingAuditing" @pickingAuditing="pickingAuditing"
@goBackPage="goBack" @goBackPage="goBack"
@editPicking="editPicking"
/> />
</div> </div>
</template> </template>
@ -23,11 +27,14 @@ import PageHeader from '@/components/pageHeader'
import Home from './component/home1.vue' import Home from './component/home1.vue'
// import AuditingPage from './component/auditingPage.vue' // import AuditingPage from './component/auditingPage.vue'
import AuditingPage from './component/auditingPage1.vue' import AuditingPage from './component/auditingPage1.vue'
import EditPicking from './component/EditPicking'
export default { export default {
components: { components: {
PageHeader, PageHeader,
Home, Home,
AuditingPage, AuditingPage,
EditPicking,
}, },
data() { data() {
return { return {
@ -35,6 +42,9 @@ export default {
pageContent: '', pageContent: '',
auditingTaskId: '', auditingTaskId: '',
isView: false, isView: false,
viewTaskId: '',
rejectTaskStatus: '',
isEdit: false,
} }
}, },
methods: { methods: {
@ -49,9 +59,20 @@ export default {
pickingView(taskId) { pickingView(taskId) {
this.auditingTaskId = taskId this.auditingTaskId = taskId
this.isView = true this.isView = true
this.isEdit = false
this.pageContent = '领料审批详情' this.pageContent = '领料审批详情'
this.isShowComponent = 'AuditingPage' this.isShowComponent = 'AuditingPage'
}, },
// 编辑领料
editPicking(row) {
console.log('🚀 ~ editPicking ~ row:', row)
this.viewTaskId = row.taskId
this.rejectTaskStatus = row.taskStatus || null
this.isView = true
this.isEdit = true
this.pageContent = '领料任务编辑'
this.isShowComponent = 'EditPicking'
},
goBack() { goBack() {
this.isShowComponent = 'Home' this.isShowComponent = 'Home'
}, },

82
src/views/warehouseManage/machinery/type/index.vue
View File

@ -182,13 +182,13 @@
prop="buyPrice" prop="buyPrice"
show-overflow-tooltip show-overflow-tooltip
/> />
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="丢失赔偿"--> <!-- label="丢失赔偿"-->
<!-- align="center"--> <!-- align="center"-->
<!-- key="payPrice"--> <!-- key="payPrice"-->
<!-- prop="payPrice"--> <!-- prop="payPrice"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- />--> <!-- />-->
<el-table-column <el-table-column
label="库管员" label="库管员"
align="center" align="center"
@ -213,13 +213,13 @@
> >
数量管理 数量管理
</el-tag> </el-tag>
<!-- <el-tag--> <!-- <el-tag-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="warning"--> <!-- type="warning"-->
<!-- v-if="row.manageType == '2'"--> <!-- v-if="row.manageType == '2'"-->
<!-- >--> <!-- >-->
<!-- 成套管理--> <!-- 成套管理-->
<!-- </el-tag>--> <!-- </el-tag>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -396,9 +396,9 @@
<el-option value="1" label="数量管理" <el-option value="1" label="数量管理"
>数量管理</el-option >数量管理</el-option
> >
<!-- <el-option value="2" label="成套管理"--> <!-- <el-option value="2" label="成套管理"-->
<!-- >成套管理</el-option--> <!-- >成套管理</el-option-->
<!-- >--> <!-- >-->
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -524,7 +524,9 @@
type="primary" type="primary"
icon="el-icon-upload" icon="el-icon-upload"
>点击上传</el-button >点击上传</el-button
><span style="color: red; margin-left: 10px">文件需小于20M</span> ><span style="color: red; margin-left: 10px"
>文件需小于20M</span
>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -559,6 +561,46 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="以大代小" prop="isReplace">
<el-select
v-model="form.isReplace"
clearable
placeholder="请选择"
style="width: 100%"
>
<el-option
label="是"
value="1"
key="1"
></el-option>
<el-option
label="否"
value="0"
key="0"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否库存管理" prop="isStorage">
<el-select
v-model="form.isStorage"
clearable
placeholder="请选择"
style="width: 100%"
>
<el-option
label="是"
value="1"
key="1"
></el-option>
<el-option
label="否"
value="0"
key="0"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -1227,7 +1269,7 @@ export default {
}, },
/* 确定 */ /* 确定 */
onSubmit() { onSubmit() {
const { id, typeName,parentId } = this.addFormParams const { id, typeName, parentId } = this.addFormParams
const addParams = { const addParams = {
parentId: id, parentId: id,
typeName, typeName,
@ -1235,7 +1277,7 @@ export default {
const editParams = { const editParams = {
typeId: id, typeId: id,
typeName, typeName,
parentId parentId,
} }
this.$refs['addFormParamsRef'].validate(async (valid) => { this.$refs['addFormParamsRef'].validate(async (valid) => {

2
vue.config.js
View File

@ -42,7 +42,7 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
// target: `http://192.168.2.125:39080`, //超 // target: `http://192.168.0.15:39080`, //韩
// target: `http://192.168.2.122:39080`, //超 // target: `http://192.168.2.122:39080`, //超
// target: `http://192.168.2.74:49080`, //旭/ // target: `http://192.168.2.74:49080`, //旭/