瀏覽代碼

bug修改

master
yangpeilai 2 週之前
父節點
當前提交
498eca1f69

+ 20
- 20
src/utils/baseService.ts 查看文件

} }
// hasPathInArray(paths, url) ? : url /newDev // hasPathInArray(paths, url) ? : url /newDev
// 连本地用的 // 连本地用的
if(url.startsWith('/invw')){
console.log('===>userw本地')
return httpN({
url: 'http://localhost:9085' + url,
method: 'post',
timeout: 60000,
headers: {
'Content-Type': 'application/json;charset=UTF-8',
...headers,
},
data: encryptionN(
{
...body,
},
2,
hasPathInArray(paths, url)
),
})
}else{
// if(url.startsWith('/invw')){
// console.log('===>userw本地')
// return httpN({
// url: 'http://localhost:9085' + url,
// method: 'post',
// timeout: 60000,
// headers: {
// 'Content-Type': 'application/json;charset=UTF-8',
// ...headers,
// },
// data: encryptionN(
// {
// ...body,
// },
// 2,
// hasPathInArray(paths, url)
// ),
// })
// }else{
return httpN({ return httpN({
url: urls + url, url: urls + url,
method: 'post', method: 'post',
hasPathInArray(paths, url) hasPathInArray(paths, url)
), ),
}) })
}
// }
}, },
get( get(
url: string | number, url: string | number,

+ 5
- 42
src/views/inventoryControl/newInventory/allocationManagement/addOrUpdate.vue 查看文件

<el-table-column label="操作" width="340" v-if="typeOption === 'add' || typeOption === 'edit'"> <el-table-column label="操作" width="340" v-if="typeOption === 'add' || typeOption === 'edit'">
<template v-slot="scope"> <template v-slot="scope">
<el-button class="op-btn" type="primary" @click="validHandle(scope.row, scope.$index)">校验</el-button> <el-button class="op-btn" type="primary" @click="validHandle(scope.row, scope.$index)">校验</el-button>
<!-- <el-button class="op-btn" type="primary" @click="validDetailHandle(scope.row)" v-if="scope.row.isShowBtn">校验失败明细</el-button>-->
<el-button class="op-btn" type="danger" v-if="scope.$index > 0" @click="deleteHandle(scope.row, scope.$index)">删除</el-button> <el-button class="op-btn" type="danger" v-if="scope.$index > 0" @click="deleteHandle(scope.row, scope.$index)">删除</el-button>
<el-button class="op-btn" type="success" v-if="scope.$index === (addForm.detailList.length - 1)" @click="addMoreHandle(scope.row)">继续添加</el-button> <el-button class="op-btn" type="success" v-if="scope.$index === (addForm.detailList.length - 1)" @click="addMoreHandle(scope.row)">继续添加</el-button>
</template> </template>
{ {
startId: "", startId: "",
endId: "", endId: "",
// warranty: "",
count: 0, count: 0,
isShowBtn: false, isShowBtn: false,
failTotal: 0, failTotal: 0,
BaseService.getDownload(url, '设备备货号段导入模板') BaseService.getDownload(url, '设备备货号段导入模板')
} }
const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => { const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
// dataFormRef.value.validate((valid) => {
// if (valid) {
// return true;
// }else {
// return false;
// }
// })
} }
const state = reactive({ const state = reactive({
btnLoding: false, btnLoding: false,
addForm: cloneDeep(initForm), addForm: cloneDeep(initForm),
warrantyList: [] as IObject[],
allList: [] as IObject[], allList: [] as IObject[],
treeData: [] as IObject[], treeData: [] as IObject[],
summary: false summary: false
const interfaceLowerListArr = ref([]); const interfaceLowerListArr = ref([]);
const interfaceAgencyArr = ref([]); const interfaceAgencyArr = ref([]);
const deviceTypeList = computed(() => { const deviceTypeList = computed(() => {
// return $storeinitData.state.dictData['DEVICE_TYPE'] || [];
return $storeinitData.state.dictData['INVENTORY_TYPE'] || []; return $storeinitData.state.dictData['INVENTORY_TYPE'] || [];
}) })
const OWN_TYPE = computed(() => { const OWN_TYPE = computed(() => {
}) })
const obuDeviceVersion = computed(() => { const obuDeviceVersion = computed(() => {
return $storeinitData.state.dictData['DEVICE_VERSION'] || []; return $storeinitData.state.dictData['DEVICE_VERSION'] || [];
// return $storeinitData.state.dictData['DEVICE_VERSION_OBU'] || [];
}) })


const deviceModelList = computed(() => { const deviceModelList = computed(() => {
return $storeinitData.state.dictData['OBU_TYPE'] || []; return $storeinitData.state.dictData['OBU_TYPE'] || [];
}) })


const {addForm, warrantyList, allList, treeData, btnLoding, summary}: any = toRefs(state)
const {addForm, allList, treeData, btnLoding, summary}: any = toRefs(state)
const rules = reactive({ const rules = reactive({
storeCodeList: [{required: true, message: "请选择入库仓库", trigger: "blur"}], storeCodeList: [{required: true, message: "请选择入库仓库", trigger: "blur"}],
ownType: [{required: true, message: "请选择产权", trigger: "blur"}], ownType: [{required: true, message: "请选择产权", trigger: "blur"}],
version: [{required: true, message: "请选择设备型号", trigger: "blur"}], version: [{required: true, message: "请选择设备型号", trigger: "blur"}],
inventoryType: [{required: true, message: "请选择设备类型", trigger: "blur"}], inventoryType: [{required: true, message: "请选择设备类型", trigger: "blur"}],
brand: [{required: true, message: "请选择设备厂商", trigger: "blur"}], brand: [{required: true, message: "请选择设备厂商", trigger: "blur"}],
// brand: [{ required: true, message: "请选择申请单类型", trigger: "blur" }],
receiveStoreCode: [{required: true, message: "请选择收货仓库", trigger: "blur"}], receiveStoreCode: [{required: true, message: "请选择收货仓库", trigger: "blur"}],
sendStoreCode: [{required: true, message: "请选择发货仓库", trigger: "blur"}], sendStoreCode: [{required: true, message: "请选择发货仓库", trigger: "blur"}],
cardType: [{ required: true, message: "请选择卡类型", trigger: "blur" }], cardType: [{ required: true, message: "请选择卡类型", trigger: "blur" }],
value: "code", value: "code",
label: "name", label: "name",
children: "subordinateModel", children: "subordinateModel",
// multiple: true,
checkStrictly: true, checkStrictly: true,
} }
const handleExceed: UploadProps['onExceed'] = (files) => { const handleExceed: UploadProps['onExceed'] = (files) => {
idex = row.id idex = row.id
} }
getLowerList(); getLowerList();
// getAgency();
clearData(); clearData();
fileList.value = [] fileList.value = []
warrantyList.value = [
{
label: "一年质保期",
value: "1年"
},
{
label: "两年质保期",
value: "2年"
},
{
label: "三年质保期",
value: "3年"
},
{
label: "四年质保期",
value: "4年"
},
{
label: "五年质保期",
value: "5年"
}
]
if (row && row.id) { if (row && row.id) {
getInfo(row.id) getInfo(row.id)
} }
let data = bizContent.transferApply || {}; let data = bizContent.transferApply || {};
let detailList = bizContent.transferDetails || []; let detailList = bizContent.transferDetails || [];
let files = []; let files = [];
files.push({url:data.filePath,name:data.filePath});
if(data.filePath!== '' && data.filePath !== null && data.filePath !== undefined){
files.push({url:data.filePath,name:data.filePath});
}
fileList.value = files; fileList.value = files;
let list: any = []; let list: any = [];
detailList.map((item) => { detailList.map((item) => {


//addForm.value.detailList = list; //addForm.value.detailList = list;
formLoding.value = false; formLoding.value = false;
} else {
formLoding.value = false;
ElMessage.error(res.message)
} }
}) })
} }


// 更新 sums 和字符串(避免直接修改外部变量) // 更新 sums 和字符串(避免直接修改外部变量)
sums[1] = totalNum; sums[1] = totalNum;
addForm.value.applyCount = totalNum
str = str + ',已校验可入库数量' + totalNum str = str + ',已校验可入库数量' + totalNum
} }
} }

+ 4
- 11
src/views/inventoryControl/newInventory/warehouseManagement/index.vue 查看文件

<crud-template ref="crudRef" class="as-weight" :submit-state="false" :home-data="field" :tableData="tableData" <crud-template ref="crudRef" class="as-weight" :submit-state="false" :home-data="field" :tableData="tableData"
@btnSearch="btnSearch" @CurrentChange="handleCurrentChange" @importData="importData" @download="downloadHandle" @btnSearch="btnSearch" @CurrentChange="handleCurrentChange" @importData="importData" @download="downloadHandle"
@refreshLeft="refreshLeft" @add="Adds" @cancel="cancel" @submit="submitAdd" @refreshLeft="refreshLeft" @add="Adds" @cancel="cancel" @submit="submitAdd"
@customSelectorSelection="customSelectorSelection" @handleEdit="itemEdit" @handleDelete="deleteHandle">
@customSelectorSelection="customSelectorSelection" @handleEdit="handleEdit" @handleDelete="deleteHandle">
<template #search> <template #search>
<el-input maxlength="60" v-trim clearable v-model="searchForm.agencyId" style="width: 200px" <el-input maxlength="60" v-trim clearable v-model="searchForm.agencyId" style="width: 200px"
placeholder="请输入渠道编号" /> placeholder="请输入渠道编号" />
const data: any = toRaw(row) const data: any = toRaw(row)
crudRef.value.dialogFormVisible = true crudRef.value.dialogFormVisible = true
crudRef.value.title = '编辑' crudRef.value.title = '编辑'
itemStartValue.value = 2
nextTick(() => { nextTick(() => {
crudRef.value.form={ crudRef.value.form={
...data ...data


const Adds = () => { const Adds = () => {
itemStartValue.value = 1 itemStartValue.value = 1
console.log("type111====>", itemStartValue.value)
} }
//表单编辑按钮 //表单编辑按钮
function itemEdit(idx: any, row: any) {
function handleEdit(idx: any, row: any) {
itemStartValue.value = 2 itemStartValue.value = 2
console.log("type====>", itemStartValue.value)
} }


// 添加 // 添加
const submitAdd = (data: any) => { const submitAdd = (data: any) => {
console.log("type====>", typeOption.value)
// request(data, itemStartValue.value)
request(data, itemStartValue.value)
} }


const request = (data: any, type: any) => { const request = (data: any, type: any) => {
//操作类型 1新增 2修改 //操作类型 1新增 2修改
console.log("type====>",type,"---->", itemStartValue.value)
BaseService.postN(type == 1 ? '/invw/api/warehouse/add' : '/invw/api/warehouse/edit', data).then((res: any) => { BaseService.postN(type == 1 ? '/invw/api/warehouse/add' : '/invw/api/warehouse/edit', data).then((res: any) => {
if (res && res.code === 0) { if (res && res.code === 0) {
getList() getList()


} }


//编辑
function handleEdit() {

}
// 删除 // 删除
function handleDetele() { function handleDetele() {



Loading…
取消
儲存