| src/api/productManage/silkRegisterForm.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/common/untils/request.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/layout/components/appsidebar/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/productManage/silkRegisterForm/addPage.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/systemSetting/silkPriceStandard/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/systemSetting/silkStandardSetting/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/productManage/silkRegisterForm.js
@@ -64,3 +64,11 @@ method: "get" }) } // 纤度登记表 根据车辆 export function getCarNumber(data) { return request({ url: "/api-jl/v1/system/getCarNumber", method: "post", data }) } src/common/untils/request.js
@@ -20,6 +20,8 @@ /(?:(?:^|.*;\s*)token\s*=\s*([^;]*).*$)|^.*$/, "$1", ); // 暂无登录，写死token token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVc2VySWQiOiI3NjFlM2NmNi05ZjRmLTQyMGQtYjc0ZC01NzNlZDc2NzA5MjAiLCJVc2VybmFtZSI6ImFkbWluIiwiTmlja05hbWUiOiIiLCJQYXJlbnRJZCI6ImFkbWluIiwiVXNlclR5cGUiOjIsIlJvbGVJZHMiOlsxXSwiT3JnSUQiOjEsIk1vZGlmaWVkUHdkIjp0cnVlLCJCdWZmZXJUaW1lIjo4NjQwMCwiZXhwIjoxNzEyNzI4MzI5LCJpc3MiOiJxbVBsdXMiLCJuYmYiOjE3MTIxMjI1Mjl9.KBJRT2PkRPG4UJD2hsO-fU_bylHMJ78xrWidq8xYMnw' if (token) { config.headers.Authorization = "Bearer " + token; } src/components/layout/components/appsidebar/index.vue
@@ -25,7 +25,7 @@ <el-menu-item index="/systemSetting/silkPriceStandard">生丝定价标准</el-menu-item> <el-menu-item index="/systemSetting/workshopManage">车间管理</el-menu-item> <el-menu-item index="/systemSetting/dataDictionary">数据字典</el-menu-item> <el-menu-item index="/systemSetting/encodeManage">编码管理</el-menu-item> <!-- <el-menu-item index="/systemSetting/encodeManage">编码管理</el-menu-item> --> </el-submenu> <el-submenu index="2"> <template slot="title"> src/views/productManage/silkRegisterForm/addPage.vue
@@ -66,6 +66,7 @@ v-model="form.market" placeholder="请选择" class="select-width" @change="getGroupNumber" > <el-option v-for="item in marketList" @@ -81,7 +82,7 @@ v-model="form.name" placeholder="请选择" class="select-width" @change="getGroupNumber" @change="getGroupNumber('name')" > <el-option v-for="item in nameList" @@ -115,7 +116,7 @@ placeholder="请先选择车间" no-data-text="请先选择车间" class="select-width" @change="getGroupNumber" @change="getGroupNumber()" > <el-option v-for="item in workshopGroupList" @@ -426,11 +427,12 @@ </template> <script> // getWorkshopManageList, // getWorkshopManageList import { saveRegister, getDictList, getRegisterDetails, getCarNumber } from "@/api/productManage/silkRegisterForm.js"; import { getCheckDetails, @@ -582,7 +584,7 @@ this.getDetailsData(); }, methods: { getDetailsData(id) { async getDetailsData(id) { if (this.activeName == "first") { this.form = { number: "", @@ -597,7 +599,7 @@ position: "", }; if (this.registerId) { getRegisterDetails({ id: id ? id : this.registerId }).then( await getRegisterDetails({ id: id ? id : this.registerId }).then( (response) => { if (response.code === 200) { let config = JSON.parse( @@ -613,7 +615,6 @@ item.productId=index+1 }) } console.log(finenessList,'===finenessList') this.tableList.tableData = finenessList this.tableData = this.tableList.tableData; } @@ -761,7 +762,7 @@ } }); }, getGroupNumber() { async getGroupNumber(val) { if (this.form.name) { //组别 let number = ""; @@ -771,17 +772,41 @@ break; } } getWorkshopManageGroup({ number: number }).then((res) => { await getWorkshopManageGroup({ number: number }).then((res) => { if (res.code == 200) { this.workshopGroupList = []; let workshopGroupList = res.data || {}; this.workshopGroupList=[] if(val=='name'){ this.form.workshopGroup='' } if (Object.keys(workshopGroupList).length > 0) { for (let i in workshopGroupList) { this.workshopGroupList.push(workshopGroupList[i]); } } } }); }) if(this.form.workshopGroup&&this.form.market){ getCarNumber({ workshopName:this.form.name, marketName:this.form.market, groupNumber:this.form.workshopGroup, }).then((res) => { if (res.code == 200) { this.tableData=[] let data = res.data?JSON.parse(JSON.stringify(res.data)) : []; if(Object.keys(data).length>0){ for(let i in data){ this.tableData.push({position:data[i],productId:Number(i)+1}) } } this.tableList.tableData = this.tableData }else{ this.tableData=[] } }); } } else { this.workshopGroupList = []; } @@ -791,7 +816,6 @@ }, // 产品新增 addProductClick() { debugger this.productId++; this.tableData.push({ productId: this.productId, @@ -811,6 +835,7 @@ item[prop] = val; } }); this.tableList.tableData= this.tableData }, tabsClick() { // if (tab.name === "first") { @@ -878,15 +903,26 @@ if (valid) { let form = JSON.parse(JSON.stringify(this.form)); // params.workshopGroup=Number(params.workshopGroup) this.isAddloading = true; if (this.activeName == "first") { delete form.circleTwo; let finenessList = JSON.parse( JSON.stringify(this.tableList.tableData) ); let isContinue=false for (let i in finenessList) { if(!finenessList[i].position||!finenessList[i].fineness||!finenessList[i].quantity||!finenessList[i].sum){ isContinue=true break; } } if(isContinue){ this.$message.error('请填写完整再保存！') return true; } for (let i in finenessList) { delete finenessList[i].productId; } this.isAddloading = true; let params = { finenessList: finenessList, ...form, @@ -895,6 +931,7 @@ if (this.inspectID) { params.ID = this.form.ID ? this.form.ID : Number(this.inspectID); } saveRegister(params) .then((res) => { if (res.code == 200) { @@ -924,6 +961,7 @@ ? this.form.ID : Number(this.registerId); } this.isAddloading = true; saveCheck(paramsTwo) .then((res) => { if (res.code == 200) { src/views/systemSetting/silkPriceStandard/index.vue
@@ -175,6 +175,7 @@ }).then(() => { deletePriceStandard({id:row.ID}).then((res)=>{ if(res&&res.code===200){ this.pagerOptions.currPage = 1; this.getData() this.$message({ type: 'success', src/views/systemSetting/silkStandardSetting/index.vue
@@ -10,8 +10,8 @@ </CommonSearch> </div> <div class="body-card"> <div class="edit-save"> <div class="edit-save-icon" @click="editSaveClick"> <div class="edit-save" @click="editSaveClick"> <div class="edit-save-icon"> <i :class="isEdit ? 'el-icon-unlock' : 'el-icon-lock'"></i> </div> <div class="edit-sace-label">{{ isEdit ? "锁定保存" : "界面设计" }}</div> @@ -204,12 +204,18 @@ // 保存编辑按钮切换 editSaveClick() { this.isEdit = !this.isEdit let tableData=JSON.parse( JSON.stringify(this.silkTableList.tableData) ); if(tableData.length==0&&!this.isEdit){ this.$message.error('请先新增再保存!') return true; } if (!this.isEdit) { let params = this.saveParam() let params = this.saveParam(tableData) saveRankStandard({ rankStandard: params }).then((res) => { console.log(res) if (res.code == 200) { this.$message.success("保存成功") this.getData() @@ -217,10 +223,7 @@ }) } }, saveParam() { let tableData=JSON.parse( JSON.stringify(this.silkTableList.tableData) ); saveParam(tableData) { for(let i in tableData){ tableData[i].dynamicsRanks=[] for(let j in this.columnInputList){ @@ -321,13 +324,15 @@ height: calc(100% - 180px); border-radius: 4px; .edit-save { width:100px; padding:0 10px; display: flex; align-items: center; margin-bottom: 10px; cursor: pointer; .edit-save-icon { font-size: 24px; color: #5582f3; cursor: pointer; } .edit-sace-label { margin-left: 10px;
